fix(tui): per-file polish round 2 — component/ top level

Author: edy

MERGE.md

@@ -197,6 +197,7 @@ fork 与上游改了同一处（常见于 TUI 视觉/UX、core 加固逻辑）
 | `packages/tui/src/{audio,attention}.ts` (错误日志级别) | 低 | 保留 `console.error` 替代 `console.debug`（上游若已做可取上游版本） |
 | `packages/tui/src/util/markdown.ts` + `test/markdown-polish.test.ts` (LLM markdown 打磨 + splitProseAndCode) | 低 | fork 新增（LaTeX→Unicode、CJK 强调符修复、`splitProseAndCode` 分段供代码块面板化），保留；若上游引入同类能力对抗审计 |
 | 逐文件打磨轮1：`ui/{spinner,dialog-select,dialog-prompt,dialog-export-options,link,icon,glyphs}.ts(x)` + `{app,app-commands,clipboard,editor,logo,audio}.ts(x)` + `util/{collapse-tool-output,filetype,presentation}.ts` + `config/keybind.ts` | 中 | 保留 bug 修复：spinner 共享 RGBA 常量原地突变改克隆；dialog-select `selectedForeground` 惰值改响应式 + setTimeout 补 onCleanup；collapse-tool-output 负 hiddenCount 防护；app-commands KV 快照改响应式读 + heap snapshot undefined 提示 + isVersionGreater 多连字符预发布；clipboard GNU screen 用平 DCS 透传；editor $EDITOR 引号感知拆分；filetype 支持无扩展名/复合后缀；presentation 复用 logo.ts + 缺 sessionID 略去 Continue 行；删除死代码（icon.tsx 未用组件/映射表、glyphs 死导出、logo.marks、audio.stopVoice、Keybinds 壳、死 onCancel prop、app.tsx console.log）（上游若已做可取上游版本） |
+| 逐文件打磨轮2：`component/{dialog-workspace-create,dialog-console-org,dialog-mcp,dialog-retry-action,dialog-session-rename,dialog-workspace-unavailable,dialog-status,spinner,bg-pulse-render,error-component,todo-item,workspace-label}.ts(x)` | 中 | 保留 bug 修复：dialog-workspace-create 最近工作区按连接状态过滤 + 空 adapters 用 `<Show>` 包裹；dialog-console-org 切换失败弹 error toast；dialog-session-rename 重命名失败弹 error toast；dialog-workspace-unavailable 恢复成功后关闭对话框；dialog-retry-action `selectedForeground` 惰值改响应式；error-component 复制失败重置 Copied 态 + ✖ 改 `GLYPH.cross`；todo-item icon/color/attrs 改派生函数（响应式）；删除死代码（dialog-mcp 未用 setRef、dialog-status 空 Props 类型、spinner SPINNER_FRAMES 别名、workspace-label 未用组件、bg-pulse-render 死导出与未用 cache:false 分支）（上游若已做可取上游版本） |
 
 ### 其他
 

packages/tui/src/component/bg-pulse-render.ts

@@ -69,18 +69,17 @@ const LOGO_TEMPLATE: LogoTemplateCell[] = LOGO_LINES.flatMap((line, y) =>
     .filter((cell): cell is LogoTemplateCell => !!cell),
 )
 
-export type Rgb = [number, number, number]
+type Rgb = [number, number, number]
 
-export type GoUpsellArtRenderOptions = {
+type GoUpsellArtRenderOptions = {
   deltaTime?: number
   rgb?: boolean
-  cache?: boolean
 }
 
 const CACHE_FRAME_COUNT = Math.round(PERIOD / (1000 / 30))
 const CACHE_FRAMES_PER_RENDER = 1
 
-export function toRgb(color: RGBA): Rgb {
+function toRgb(color: RGBA): Rgb {
   const [r, g, b] = color.toInts()
   return [r, g, b]
 }
@@ -171,12 +170,7 @@ export class GoUpsellArtPainter {
     const rgb = options.rgb === true
     this.elapsed = (this.elapsed + (options.deltaTime ?? 0)) % PERIOD
     this.rebuildGeometry(frameBuffer, rgb)
-    if (options.cache !== false) {
-      this.drawCached(frameBuffer, rgb)
-      return
-    }
-    this.drawBackground(frameBuffer, this.elapsed)
-    this.drawLogo(frameBuffer, this.elapsed, rgb)
+    this.drawCached(frameBuffer, rgb)
   }
 
   private invalidateCache() {

packages/tui/src/component/dialog-console-org.tsx

@@ -95,15 +95,23 @@ export function DialogConsoleOrg() {
             return
           }
 
-          await sdk.client.experimental.console.switchOrg(
-            {
-              accountID: item.accountID,
-              orgID: item.orgID,
-            },
-            { throwOnError: true },
-          )
-
-          await sdk.client.instance.dispose()
+          try {
+            await sdk.client.experimental.console.switchOrg(
+              {
+                accountID: item.accountID,
+                orgID: item.orgID,
+              },
+              { throwOnError: true },
+            )
+            await sdk.client.instance.dispose()
+          } catch (error) {
+            toast.show({
+              title: "Failed to switch org",
+              message: errorMessage(error),
+              variant: "error",
+            })
+            return
+          }
           toast.show({
             message: `Switched to ${item.orgName}`,
             variant: "info",

packages/tui/src/component/dialog-mcp.tsx

@@ -2,7 +2,7 @@ import { createMemo, createSignal } from "solid-js"
 import { useLocal } from "../context/local"
 import { useSync } from "../context/sync"
 import { map, pipe, entries, sortBy } from "remeda"
-import { DialogSelect, type DialogSelectRef, type DialogSelectOption } from "../ui/dialog-select"
+import { DialogSelect, type DialogSelectOption } from "../ui/dialog-select"
 import { useTheme } from "../context/theme"
 import { TextAttributes } from "@opentui/core"
 import { useSDK } from "../context/sdk"
@@ -24,7 +24,6 @@ export function DialogMcp() {
   const sync = useSync()
   const sdk = useSDK()
   const { theme } = useTheme()
-  const [, setRef] = createSignal<DialogSelectRef<unknown>>()
   const [loading, setLoading] = createSignal<string | null>(null)
 
   const options = createMemo(() => {
@@ -39,7 +38,7 @@ export function DialogMcp() {
       map(([name, status]) => ({
         value: name,
         title: name,
-        description: status.status === "failed" ? "failed" : status.status,
+        description: status.status,
         footer: <Status enabled={local.mcp.isEnabled(name)} loading={loadingMcp === name} />,
         category: undefined,
       })),
@@ -75,7 +74,6 @@ export function DialogMcp() {
 
   return (
     <DialogSelect
-      ref={setRef}
       title="MCPs"
       options={options()}
       emptyView={

packages/tui/src/component/dialog-retry-action.tsx

@@ -39,7 +39,7 @@ function panelOverlay(color: RGBA) {
 export function DialogRetryAction(props: DialogRetryActionProps) {
   const dialog = useDialog()
   const { theme } = useTheme()
-  const fg = selectedForeground(theme)
+  const fg = () => selectedForeground(theme)
   const showGoTreatment = () => props.link === GO_URL
   const textBg = () => (showGoTreatment() ? panelOverlay(theme.backgroundPanel) : undefined)
   const [selected, setSelected] = createSignal<"dismiss" | "action">("action")
@@ -119,7 +119,7 @@ export function DialogRetryAction(props: DialogRetryActionProps) {
             onMouseUp={() => dismiss(props, dialog)}
           >
             <text
-              fg={selected() === "dismiss" ? fg : theme.textMuted}
+              fg={selected() === "dismiss" ? fg() : theme.textMuted}
               bg={selected() === "dismiss" ? undefined : textBg()}
               attributes={selected() === "dismiss" ? TextAttributes.BOLD : undefined}
             >
@@ -134,7 +134,7 @@ export function DialogRetryAction(props: DialogRetryActionProps) {
             onMouseUp={() => runAction(props, dialog)}
           >
             <text
-              fg={selected() === "action" ? fg : theme.text}
+              fg={selected() === "action" ? fg() : theme.text}
               bg={selected() === "action" ? undefined : textBg()}
               attributes={selected() === "action" ? TextAttributes.BOLD : undefined}
             >

packages/tui/src/component/dialog-session-rename.tsx

@@ -3,6 +3,8 @@ import { useDialog } from "../ui/dialog"
 import { useSync } from "../context/sync"
 import { createMemo } from "solid-js"
 import { useSDK } from "../context/sdk"
+import { useToast } from "../ui/toast"
+import { errorMessage } from "../util/error"
 
 interface DialogSessionRenameProps {
   session: string
@@ -12,17 +14,22 @@ export function DialogSessionRename(props: DialogSessionRenameProps) {
   const dialog = useDialog()
   const sync = useSync()
   const sdk = useSDK()
+  const toast = useToast()
   const session = createMemo(() => sync.session.get(props.session))
 
   return (
     <DialogPrompt
       title="Rename Session"
       value={session()?.title}
       onConfirm={(value) => {
-        void sdk.client.session.update({
-          sessionID: props.session,
-          title: value,
-        })
+        sdk.client.session
+          .update({
+            sessionID: props.session,
+            title: value,
+          })
+          .catch((error) => {
+            toast.show({ title: "Failed to rename session", message: errorMessage(error), variant: "error" })
+          })
         dialog.clear()
       }}
     />

packages/tui/src/component/dialog-status.tsx

@@ -6,8 +6,6 @@ import { useSync } from "../context/sync"
 import { For, Match, Switch, Show, createMemo } from "solid-js"
 import { GLYPH } from "../ui/glyphs"
 
-export type DialogStatusProps = {}
-
 export function DialogStatus() {
   const sync = useSync()
   const { theme } = useTheme()

packages/tui/src/component/dialog-workspace-create.tsx

@@ -4,7 +4,7 @@ import { DialogSelect, type DialogSelectOption } from "../ui/dialog-select"
 import { useSync } from "../context/sync"
 import { useProject } from "../context/project"
 import { useRoute } from "../context/route"
-import { createMemo, createSignal, onMount } from "solid-js"
+import { createMemo, createSignal, onMount, Show } from "solid-js"
 import { errorMessage } from "../util/error"
 import { useSDK } from "../context/sdk"
 import { useToast } from "../ui/toast"
@@ -38,7 +38,9 @@ export function recentConnectedWorkspaces<WorkspaceInfo extends { id: string; ti
   limit?: number
   omitWorkspaceID?: string
 }) {
-  const allWorkspaces = input.workspaces.filter((workspace) => input.status(workspace.id) === "connected")
+  const allWorkspaces = input.workspaces.filter(
+    (workspace) => workspace.id !== input.omitWorkspaceID && input.status(workspace.id) === "connected",
+  )
   const workspaces = allWorkspaces.toSorted((a, b) => Number(b.timeUsed) - Number(a.timeUsed))
   const recent = workspaces.slice(0, input.limit ?? 3)
 
@@ -243,9 +245,9 @@ export function DialogWorkspaceSelect(props: {
     ]
   })
 
-  if (!adapters()) return null
   return (
-    <DialogSelect<WorkspaceSelectValue>
+    <Show when={adapters()}>
+      <DialogSelect<WorkspaceSelectValue>
       title="Warp"
       skipFilter={true}
       renderFilter={false}
@@ -270,6 +272,7 @@ export function DialogWorkspaceSelect(props: {
         ))
       }}
     />
+    </Show>
   )
 }
 

packages/tui/src/component/dialog-workspace-unavailable.tsx

@@ -21,6 +21,7 @@ export function DialogWorkspaceUnavailable(props: { onRestore?: () => boolean |
     }
     const result = await props.onRestore?.()
     if (result === false) return
+    dialog.clear()
   }
 
   useBindings(() => ({

packages/tui/src/component/error-component.tsx

@@ -7,6 +7,7 @@ import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { useExit } from "../context/exit"
 import { describeOS, describeTerminal } from "../util/system"
 import { AnimatedIcon } from "../ui/icon"
+import { GLYPH } from "../ui/glyphs"
 
 export function ErrorComponent(props: { error: Error; reset: () => void; mode?: "dark" | "light" }) {
   const term = useTerminalDimensions()
@@ -46,7 +47,9 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
   const issueURL = buildIssueURL(message, stack)
 
   const copyReport = () => {
-    void clipboard.write?.(issueURL.toString()).then(() => setCopied(true))
+    void clipboard.write?.(issueURL.toString())
+      .then(() => setCopied(true))
+      .catch(() => setCopied(false))
   }
 
   const actions = [
@@ -111,7 +114,7 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
         <box flexDirection="column" alignItems="center" flexShrink={0} gap={0}>
           <box flexDirection="row" gap={1} alignItems="center">
             <text fg={colors.error} attributes={TextAttributes.BOLD}>
-              ✖
+              {GLYPH.cross}
             </text>
             <text attributes={TextAttributes.BOLD} fg={colors.text}>
               opencode crashed