Skip to content

Commit ac1ddc3

Browse files
committed
refactor(tui): simplify config and tool display
1 parent 8f904c8 commit ac1ddc3

44 files changed

Lines changed: 264 additions & 315 deletions

Some content is hidden

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

‎packages/cli/src/mini/runtime.boot.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// history ring. All are async because they read config or hit the SDK, but
77
// none block each other.
88
import { Context, Effect, Layer } from "effect"
9-
import { resolve } from "@opencode-ai/tui/config"
9+
import { resolve } from "@opencode-ai/tui/config/v1"
1010
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
1111
import { makeGlobalNode } from "@opencode-ai/core/effect/app-node"
1212
import { makeRuntime } from "@opencode-ai/core/effect/runtime"

‎packages/cli/src/mini/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// → OpenTUI split-footer renderer writes to terminal
1414
import type { OpenCodeClient, ReferenceListOutput } from "@opencode-ai/client/promise"
1515
import type { FilePart, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
16-
import type { TuiConfig } from "@opencode-ai/tui/config"
16+
import type { TuiConfig } from "@opencode-ai/tui/config/v1"
1717

1818
export type RunFilePart = {
1919
type: "file"

‎packages/cli/src/tui-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * as TuiConfig from "./tui-config"
22

33
import { Global } from "@opencode-ai/core/global"
4-
import { TuiConfig } from "@opencode-ai/tui/config"
4+
import { TuiConfig } from "@opencode-ai/tui/config/v1"
55
import { Effect, FileSystem, Option, Schema } from "effect"
66
import { parse, type ParseError } from "jsonc-parser"
77
import path from "path"

‎packages/cli/test/footer-keymap.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
33
import { testRender, useRenderer } from "@opentui/solid"
44
import { OpencodeKeymapProvider, registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
5-
import { resolve } from "@opencode-ai/tui/config"
5+
import { resolve } from "@opencode-ai/tui/config/v1"
66
import { expect, test } from "bun:test"
77
import { createComponent, createSignal } from "solid-js"
88
import { RunFooterView } from "../src/mini/footer.view"

‎packages/opencode/script/schema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { Config } from "@/config/config"
44
import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
5-
import { TuiConfig } from "@opencode-ai/tui/config"
5+
import { TuiConfig } from "@opencode-ai/tui/config/v1"
66
import { Schema } from "effect"
77

88
type JsonSchema = Record<string, unknown>

‎packages/opencode/src/config/tui-host-attention.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TuiConfig } from "@opencode-ai/tui/config"
1+
import { TuiConfig } from "@opencode-ai/tui/config/v1"
22
import { isRecord } from "@opencode-ai/tui/util/record"
33
import { Filesystem } from "@/util/filesystem"
44
import { Schema } from "effect"

‎packages/opencode/src/config/tui-migrate.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from "path"
22
import { type ParseError as JsoncParseError, applyEdits, modify, parse as parseJsonc } from "jsonc-parser"
33
import { unique } from "remeda"
44
import { Option, Schema } from "effect"
5-
import { TuiConfig } from "@opencode-ai/tui/config"
5+
import { TuiConfig } from "@opencode-ai/tui/config/v1"
66
import { Flag } from "@opencode-ai/core/flag/flag"
77
import { Global } from "@opencode-ai/core/global"
88
import { Filesystem } from "@/util/filesystem"

‎packages/opencode/src/config/tui.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import { Global } from "@opencode-ai/core/global"
1515
import { FSUtil } from "@opencode-ai/core/fs-util"
1616
import { CurrentWorkingDirectory } from "./tui-cwd"
1717
import { ConfigPlugin } from "@/config/plugin"
18-
import { TuiKeybind } from "@opencode-ai/tui/config/keybind"
18+
import { TuiKeybind } from "@opencode-ai/tui/config/v1/keybind"
1919
import { InstallationLocal, InstallationVersion } from "@opencode-ai/core/installation/version"
2020
import { makeRuntime } from "@opencode-ai/core/effect/runtime"
2121
import { Filesystem } from "@/util/filesystem"
2222
import { ConfigVariable } from "@/config/variable"
2323
import { Npm } from "@opencode-ai/core/npm"
2424
import { FormatError, FormatUnknownError } from "@/cli/error"
25-
import { TuiConfig } from "@opencode-ai/tui/config"
25+
import { TuiConfig } from "@opencode-ai/tui/config/v1"
2626

2727
export const Info = TuiConfig.Info
2828
export type Info = TuiConfig.Info

‎packages/opencode/test/cli/cmd/tui/attention.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, test } from "bun:test"
22
import type { AudioPlayOptions, AudioSound } from "@opentui/core"
33
import { createTuiAttention } from "@opencode-ai/tui/attention"
4-
import type { TuiConfig } from "@opencode-ai/tui/config"
4+
import type { TuiConfig } from "@opencode-ai/tui/config/v1"
55

66
type FocusEvent = "focus" | "blur"
77

‎packages/opencode/test/cli/run/runtime.boot.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
22
import { OpenCode } from "@opencode-ai/client/promise"
3-
import type { Resolved } from "@opencode-ai/tui/config"
3+
import type { Resolved } from "@opencode-ai/tui/config/v1"
44
import { resolveDiffStyle, resolveModelInfo, resolveRunTuiConfig } from "@opencode-ai/cli/mini/runtime.boot"
55
import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
66

0 commit comments

Comments
 (0)