+
{
inputRef = el
@@ -895,18 +794,3 @@ export default function Page() {
)
}
-
-function StickyAccordionHeader(props: ParentProps<{ class?: string }>) {
- return (
-
- {props.children}
-
- )
-}
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index 220780709..5572d0d63 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
id = "opencode"
name = "OpenCode"
description = "The AI coding agent built for the terminal"
-version = "1.0.62"
+version = "1.0.65"
schema_version = 1
authors = ["Anomaly"]
repository = "https://github.com/sst/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
icon = "./icons/opencode.svg"
[agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.62/opencode-darwin-arm64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.65/opencode-darwin-arm64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.62/opencode-darwin-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.65/opencode-darwin-x64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.62/opencode-linux-arm64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.65/opencode-linux-arm64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.62/opencode-linux-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.65/opencode-linux-x64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.62/opencode-windows-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.65/opencode-windows-x64.zip"
cmd = "./opencode.exe"
args = ["acp"]
diff --git a/packages/function/package.json b/packages/function/package.json
index dbe47b50d..911ac02c6 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/function",
- "version": "1.0.62",
+ "version": "1.0.65",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/opencode/bin/opencode b/packages/opencode/bin/opencode
index 8f75eb189..e35cc0094 100755
--- a/packages/opencode/bin/opencode
+++ b/packages/opencode/bin/opencode
@@ -1,61 +1,84 @@
-#!/bin/sh
-set -e
+#!/usr/bin/env node
-if [ -n "$OPENCODE_BIN_PATH" ]; then
- resolved="$OPENCODE_BIN_PATH"
-else
- # Get the real path of this script, resolving any symlinks
- script_path="$0"
- while [ -L "$script_path" ]; do
- link_target="$(readlink "$script_path")"
- case "$link_target" in
- /*) script_path="$link_target" ;;
- *) script_path="$(dirname "$script_path")/$link_target" ;;
- esac
- done
- script_dir="$(dirname "$script_path")"
- script_dir="$(cd "$script_dir" && pwd)"
-
- # Map platform names
- case "$(uname -s)" in
- Darwin) platform="darwin" ;;
- Linux) platform="linux" ;;
- MINGW*|CYGWIN*|MSYS*) platform="win32" ;;
- *) platform="$(uname -s | tr '[:upper:]' '[:lower:]')" ;;
- esac
-
- # Map architecture names
- case "$(uname -m)" in
- x86_64|amd64) arch="x64" ;;
- aarch64) arch="arm64" ;;
- armv7l) arch="arm" ;;
- *) arch="$(uname -m)" ;;
- esac
-
- name="opencode-${platform}-${arch}"
- binary="opencode"
- [ "$platform" = "win32" ] && binary="opencode.exe"
-
- # Search for the binary starting from real script location
- resolved=""
- current_dir="$script_dir"
- while [ "$current_dir" != "/" ]; do
- candidate="$current_dir/node_modules/$name/bin/$binary"
- if [ -f "$candidate" ]; then
- resolved="$candidate"
- break
- fi
- current_dir="$(dirname "$current_dir")"
- done
-
- if [ -z "$resolved" ]; then
- printf "It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the \"%s\" package\n" "$name" >&2
- exit 1
- fi
-fi
+const childProcess = require("child_process")
+const fs = require("fs")
+const path = require("path")
+const os = require("os")
-# Handle SIGINT gracefully
-trap '' INT
+function run(target) {
+ const result = childProcess.spawnSync(target, process.argv.slice(2), {
+ stdio: "inherit",
+ })
+ if (result.error) {
+ console.error(result.error.message)
+ process.exit(1)
+ }
+ const code = typeof result.status === "number" ? result.status : 0
+ process.exit(code)
+}
-# Execute the binary with all arguments
-exec "$resolved" "$@"
+const envPath = process.env.OPENCODE_BIN_PATH
+if (envPath) {
+ run(envPath)
+}
+
+const scriptPath = fs.realpathSync(__filename)
+const scriptDir = path.dirname(scriptPath)
+
+const platformMap = {
+ darwin: "darwin",
+ linux: "linux",
+ win32: "windows",
+}
+const archMap = {
+ x64: "x64",
+ arm64: "arm64",
+ arm: "arm",
+}
+
+let platform = platformMap[os.platform()]
+if (!platform) {
+ platform = os.platform()
+}
+let arch = archMap[os.arch()]
+if (!arch) {
+ arch = os.arch()
+}
+const base = "opencode-" + platform + "-" + arch
+const binary = platform === "windows" ? "opencode.exe" : "opencode"
+
+function findBinary(startDir) {
+ let current = startDir
+ for (;;) {
+ const modules = path.join(current, "node_modules")
+ if (fs.existsSync(modules)) {
+ const entries = fs.readdirSync(modules)
+ for (const entry of entries) {
+ if (!entry.startsWith(base)) {
+ continue
+ }
+ const candidate = path.join(modules, entry, "bin", binary)
+ if (fs.existsSync(candidate)) {
+ return candidate
+ }
+ }
+ }
+ const parent = path.dirname(current)
+ if (parent === current) {
+ return
+ }
+ current = parent
+ }
+}
+
+const resolved = findBinary(scriptDir)
+if (!resolved) {
+ console.error(
+ 'It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the "' +
+ base +
+ '" package',
+ )
+ process.exit(1)
+}
+
+run(resolved)
diff --git a/packages/opencode/bin/opencode.cmd b/packages/opencode/bin/opencode.cmd
deleted file mode 100644
index 775bfe688..000000000
--- a/packages/opencode/bin/opencode.cmd
+++ /dev/null
@@ -1,58 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-if defined OPENCODE_BIN_PATH (
- set "resolved=%OPENCODE_BIN_PATH%"
- goto :execute
-)
-
-rem Get the directory of this script
-set "script_dir=%~dp0"
-set "script_dir=%script_dir:~0,-1%"
-
-rem Detect platform and architecture
-set "platform=windows"
-
-rem Detect architecture
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
- set "arch=x64"
-) else if "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
- set "arch=arm64"
-) else if "%PROCESSOR_ARCHITECTURE%"=="x86" (
- set "arch=x86"
-) else (
- set "arch=x64"
-)
-
-set "name=opencode-!platform!-!arch!"
-set "binary=opencode.exe"
-
-rem Search for the binary starting from script location
-set "resolved="
-set "current_dir=%script_dir%"
-
-:search_loop
-set "candidate=%current_dir%\node_modules\%name%\bin\%binary%"
-if exist "%candidate%" (
- set "resolved=%candidate%"
- goto :execute
-)
-
-rem Move up one directory
-for %%i in ("%current_dir%") do set "parent_dir=%%~dpi"
-set "parent_dir=%parent_dir:~0,-1%"
-
-rem Check if we've reached the root
-if "%current_dir%"=="%parent_dir%" goto :not_found
-set "current_dir=%parent_dir%"
-goto :search_loop
-
-:not_found
-echo It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the "%name%" package >&2
-exit /b 1
-
-:execute
-rem Execute the binary with all arguments in the same console window
-rem Use start /b /wait to ensure it runs in the current shell context for all shells
-start /b /wait "" "%resolved%" %*
-exit /b %ERRORLEVEL%
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 76dcffb84..764a40683 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
- "version": "1.0.62",
+ "version": "1.0.65",
"name": "opencode",
"type": "module",
"private": true,
diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
index 97631d907..502baed02 100755
--- a/packages/opencode/script/build.ts
+++ b/packages/opencode/script/build.ts
@@ -66,11 +66,11 @@ const allTargets: {
avx2: false,
},
{
- os: "windows",
+ os: "win32",
arch: "x64",
},
{
- os: "windows",
+ os: "win32",
arch: "x64",
avx2: false,
},
@@ -88,7 +88,8 @@ await $`bun install --os="*" --cpu="*" @parcel/watcher@${pkg.dependencies["@parc
for (const item of targets) {
const name = [
pkg.name,
- item.os,
+ // changing to win32 flags npm for some reason
+ item.os === "win32" ? "windows" : item.os,
item.arch,
item.avx2 === false ? "baseline" : undefined,
item.abi === undefined ? undefined : item.abi,
@@ -115,7 +116,7 @@ for (const item of targets) {
entrypoints: ["./src/index.ts", parserWorker, workerPath],
define: {
OPENCODE_VERSION: `'${Script.version}'`,
- OTUI_TREE_SITTER_WORKER_PATH: "/$bunfs/root/" + path.relative(dir, parserWorker),
+ OTUI_TREE_SITTER_WORKER_PATH: "/$bunfs/root/" + path.relative(dir, parserWorker).replaceAll("\\", "/"),
OPENCODE_WORKER_PATH: workerPath,
OPENCODE_CHANNEL: `'${Script.channel}'`,
},
@@ -127,7 +128,7 @@ for (const item of targets) {
{
name,
version: Script.version,
- os: [item.os === "windows" ? "win32" : item.os],
+ os: [item.os],
cpu: [item.arch],
},
null,
diff --git a/packages/opencode/script/postinstall.mjs b/packages/opencode/script/postinstall.mjs
index b875d158f..78f022c9f 100644
--- a/packages/opencode/script/postinstall.mjs
+++ b/packages/opencode/script/postinstall.mjs
@@ -50,79 +50,66 @@ function detectPlatformAndArch() {
function findBinary() {
const { platform, arch } = detectPlatformAndArch()
const packageName = `opencode-${platform}-${arch}`
- const binary = platform === "windows" ? "opencode.exe" : "opencode"
+ const binaryName = platform === "windows" ? "opencode.exe" : "opencode"
try {
// Use require.resolve to find the package
const packageJsonPath = require.resolve(`${packageName}/package.json`)
const packageDir = path.dirname(packageJsonPath)
- const binaryPath = path.join(packageDir, "bin", binary)
+ const binaryPath = path.join(packageDir, "bin", binaryName)
if (!fs.existsSync(binaryPath)) {
throw new Error(`Binary not found at ${binaryPath}`)
}
- return binaryPath
+ return { binaryPath, binaryName }
} catch (error) {
throw new Error(`Could not find package ${packageName}: ${error.message}`)
}
}
-async function regenerateWindowsCmdWrappers() {
- console.log("Windows + npm detected: Forcing npm to rebuild bin links")
+function prepareBinDirectory(binaryName) {
+ const binDir = path.join(__dirname, "bin")
+ const targetPath = path.join(binDir, binaryName)
- try {
- const { execSync } = require("child_process")
- const pkgPath = path.join(__dirname, "..")
+ // Ensure bin directory exists
+ if (!fs.existsSync(binDir)) {
+ fs.mkdirSync(binDir, { recursive: true })
+ }
- // npm_config_global is string | undefined
- // if it exists, the value is true
- const isGlobal = process.env.npm_config_global === "true" || pkgPath.includes(path.join("npm", "node_modules"))
+ // Remove existing binary/symlink if it exists
+ if (fs.existsSync(targetPath)) {
+ fs.unlinkSync(targetPath)
+ }
- // The npm rebuild command does 2 things - Execute lifecycle scripts and rebuild bin links
- // We want to skip lifecycle scripts to avoid infinite loops, so we use --ignore-scripts
- const cmd = `npm rebuild opencode-ai --ignore-scripts${isGlobal ? " -g" : ""}`
- const opts = {
- stdio: "inherit",
- shell: true,
- ...(isGlobal ? {} : { cwd: path.join(pkgPath, "..", "..") }), // For local, run from project root
- }
+ return { binDir, targetPath }
+}
- console.log(`Running: ${cmd}`)
- execSync(cmd, opts)
- console.log("Successfully rebuilt npm bin links")
- } catch (error) {
- console.error("Error rebuilding npm links:", error.message)
- console.error("npm rebuild failed. You may need to manually run: npm rebuild opencode-ai --ignore-scripts")
+function symlinkBinary(sourcePath, binaryName) {
+ const { targetPath } = prepareBinDirectory(binaryName)
+
+ fs.symlinkSync(sourcePath, targetPath)
+ console.log(`opencode binary symlinked: ${targetPath} -> ${sourcePath}`)
+
+ // Verify the file exists after operation
+ if (!fs.existsSync(targetPath)) {
+ throw new Error(`Failed to symlink binary to ${targetPath}`)
}
}
async function main() {
try {
if (os.platform() === "win32") {
- // NPM eg format - npm/11.4.2 node/v24.4.1 win32 x64
- // Bun eg format - bun/1.2.19 npm/? node/v24.3.0 win32 x64
- if (process.env.npm_config_user_agent.startsWith("npm")) {
- await regenerateWindowsCmdWrappers()
- } else {
- console.log("Windows detected but not npm, skipping postinstall")
- }
+ // On Windows, the .exe is already included in the package and bin field points to it
+ // No postinstall setup needed
+ console.log("Windows detected: binary setup not needed (using packaged .exe)")
return
}
- const binaryPath = findBinary()
- const binScript = path.join(__dirname, "bin", "opencode")
-
- // Remove existing bin script if it exists
- if (fs.existsSync(binScript)) {
- fs.unlinkSync(binScript)
- }
-
- // Create symlink to the actual binary
- fs.symlinkSync(binaryPath, binScript)
- console.log(`opencode binary symlinked: ${binScript} -> ${binaryPath}`)
+ const { binaryPath, binaryName } = findBinary()
+ symlinkBinary(binaryPath, binaryName)
} catch (error) {
- console.error("Failed to create opencode binary symlink:", error.message)
+ console.error("Failed to setup opencode binary:", error.message)
process.exit(1)
}
}
diff --git a/packages/opencode/script/preinstall.mjs b/packages/opencode/script/preinstall.mjs
deleted file mode 100644
index dfe46d9e7..000000000
--- a/packages/opencode/script/preinstall.mjs
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env node
-
-import fs from "fs"
-import path from "path"
-import os from "os"
-import { fileURLToPath } from "url"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-function main() {
- if (os.platform() !== "win32") {
- console.log("Non-Windows platform detected, skipping preinstall")
- return
- }
-
- console.log("Windows detected: Modifying package.json bin entry")
-
- // Read package.json
- const packageJsonPath = path.join(__dirname, "package.json")
- const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"))
-
- // Modify bin to point to .cmd file on Windows
- packageJson.bin = {
- opencode: "./bin/opencode.cmd",
- }
-
- // Write it back
- fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
- console.log("Updated package.json bin to use opencode.cmd")
-
- // Now you can also remove the Unix script if you want
- const unixScript = path.join(__dirname, "bin", "opencode")
- if (fs.existsSync(unixScript)) {
- console.log("Removing Unix shell script")
- fs.unlinkSync(unixScript)
- }
-}
-
-try {
- main()
-} catch (error) {
- console.error("Preinstall script error:", error.message)
- process.exit(0)
-}
diff --git a/packages/opencode/script/publish.ts b/packages/opencode/script/publish.ts
index 3e989cc6a..d5afe56fb 100755
--- a/packages/opencode/script/publish.ts
+++ b/packages/opencode/script/publish.ts
@@ -2,8 +2,9 @@
import { $ } from "bun"
import pkg from "../package.json"
import { Script } from "@opencode-ai/script"
+import { fileURLToPath } from "url"
-const dir = new URL("..", import.meta.url).pathname
+const dir = fileURLToPath(new URL("..", import.meta.url))
process.chdir(dir)
const { binaries } = await import("./build.ts")
@@ -15,8 +16,8 @@ const { binaries } = await import("./build.ts")
await $`mkdir -p ./dist/${pkg.name}`
await $`cp -r ./bin ./dist/${pkg.name}/bin`
-await $`cp ./script/preinstall.mjs ./dist/${pkg.name}/preinstall.mjs`
await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
+
await Bun.file(`./dist/${pkg.name}/package.json`).write(
JSON.stringify(
{
@@ -25,7 +26,6 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
[pkg.name]: `./bin/${pkg.name}`,
},
scripts: {
- preinstall: "bun ./preinstall.mjs || node ./preinstall.mjs",
postinstall: "bun ./postinstall.mjs || node ./postinstall.mjs",
},
version: Script.version,
@@ -36,7 +36,15 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
),
)
for (const [name] of Object.entries(binaries)) {
- await $`cd dist/${name} && chmod 777 -R . && bun publish --access public --tag ${Script.channel}`
+ try {
+ process.chdir(`./dist/${name}`)
+ if (process.platform !== "win32") {
+ await $`chmod 755 -R .`
+ }
+ await $`bun publish --access public --tag ${Script.channel}`
+ } finally {
+ process.chdir(dir)
+ }
}
await $`cd ./dist/${pkg.name} && bun publish --access public --tag ${Script.channel}`
diff --git a/packages/opencode/src/cli/cmd/tui/context/exit.tsx b/packages/opencode/src/cli/cmd/tui/context/exit.tsx
index 7d7feaa28..612c39157 100644
--- a/packages/opencode/src/cli/cmd/tui/context/exit.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/exit.tsx
@@ -1,13 +1,18 @@
import { useRenderer } from "@opentui/solid"
import { createSimpleContext } from "./helper"
+import { FormatError } from "@/cli/error"
export const { use: useExit, provider: ExitProvider } = createSimpleContext({
name: "Exit",
init: (input: { onExit?: () => Promise
}) => {
const renderer = useRenderer()
- return async () => {
+ return async (reason?: any) => {
renderer.destroy()
await input.onExit?.()
+ if (reason) {
+ const formatted = FormatError(reason) ?? JSON.stringify(reason)
+ process.stderr.write(formatted + "\n")
+ }
process.exit(0)
}
},
diff --git a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
index 655c68022..8b7564eb5 100644
--- a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
@@ -10,11 +10,6 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
const sdk = createOpencodeClient({
baseUrl: props.url,
signal: abort.signal,
- fetch: (req) => {
- // @ts-ignore
- req.timeout = false
- return fetch(req)
- },
})
const emitter = createGlobalEmitter<{
diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
index 7fcbbc57c..2c994a4a3 100644
--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
@@ -18,6 +18,8 @@ import { useSDK } from "@tui/context/sdk"
import { Binary } from "@/util/binary"
import { createSimpleContext } from "./helper"
import type { Snapshot } from "@/snapshot"
+import { useExit } from "./exit"
+import { onMount } from "solid-js"
export const { use: useSync, provider: SyncProvider } = createSimpleContext({
name: "Sync",
@@ -226,29 +228,37 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
}
})
- // blocking
- Promise.all([
- sdk.client.config.providers({ throwOnError: true }).then((x) => setStore("provider", x.data!.providers)),
- sdk.client.app.agents({ throwOnError: true }).then((x) => setStore("agent", x.data ?? [])),
- sdk.client.config.get({ throwOnError: true }).then((x) => setStore("config", x.data!)),
- ]).then(() => {
- setStore("status", "partial")
- // non-blocking
+ const exit = useExit()
+
+ onMount(() => {
+ // blocking
Promise.all([
- sdk.client.session.list().then((x) =>
- setStore(
- "session",
- (x.data ?? []).toSorted((a, b) => a.id.localeCompare(b.id)),
- ),
- ),
- sdk.client.command.list().then((x) => setStore("command", x.data ?? [])),
- sdk.client.lsp.status().then((x) => setStore("lsp", x.data!)),
- sdk.client.mcp.status().then((x) => setStore("mcp", x.data!)),
- sdk.client.formatter.status().then((x) => setStore("formatter", x.data!)),
- sdk.client.session.status().then((x) => setStore("session_status", x.data!)),
- ]).then(() => {
- setStore("status", "complete")
- })
+ sdk.client.config.providers({ throwOnError: true }).then((x) => setStore("provider", x.data!.providers)),
+ sdk.client.app.agents({ throwOnError: true }).then((x) => setStore("agent", x.data ?? [])),
+ sdk.client.config.get({ throwOnError: true }).then((x) => setStore("config", x.data!)),
+ ])
+ .then(() => {
+ setStore("status", "partial")
+ // non-blocking
+ Promise.all([
+ sdk.client.session.list().then((x) =>
+ setStore(
+ "session",
+ (x.data ?? []).toSorted((a, b) => a.id.localeCompare(b.id)),
+ ),
+ ),
+ sdk.client.command.list().then((x) => setStore("command", x.data ?? [])),
+ sdk.client.lsp.status().then((x) => setStore("lsp", x.data!)),
+ sdk.client.mcp.status().then((x) => setStore("mcp", x.data!)),
+ sdk.client.formatter.status().then((x) => setStore("formatter", x.data!)),
+ sdk.client.session.status().then((x) => setStore("session_status", x.data!)),
+ ]).then(() => {
+ setStore("status", "complete")
+ })
+ })
+ .catch(async (e) => {
+ await exit(e)
+ })
})
const result = {
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 64605e9df..1e5536a1e 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -17,7 +17,14 @@ import { useRoute, useRouteData } from "@tui/context/route"
import { useSync } from "@tui/context/sync"
import { SplitBorder } from "@tui/component/border"
import { useTheme } from "@tui/context/theme"
-import { BoxRenderable, ScrollBoxRenderable, addDefaultParsers } from "@opentui/core"
+import {
+ BoxRenderable,
+ ScrollBoxRenderable,
+ TextAttributes,
+ addDefaultParsers,
+ MacOSScrollAccel,
+ type ScrollAcceleration,
+} from "@opentui/core"
import { Prompt, type PromptRef } from "@tui/component/prompt"
import type { AssistantMessage, Part, ToolPart, UserMessage, TextPart, ReasoningPart } from "@opencode-ai/sdk"
import { useLocal } from "@tui/context/local"
@@ -61,6 +68,16 @@ import stripAnsi from "strip-ansi"
addDefaultParsers(parsers.parsers)
+class CustomSpeedScroll implements ScrollAcceleration {
+ constructor(private speed: number) {}
+
+ tick(_now?: number): number {
+ return this.speed
+ }
+
+ reset(): void {}
+}
+
const context = createContext<{
width: number
conceal: () => boolean
@@ -99,6 +116,17 @@ export function Session() {
const sidebarVisible = createMemo(() => sidebar() === "show" || (sidebar() === "auto" && wide()))
const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() ? 42 : 0) - 4)
+ const scrollAcceleration = createMemo(() => {
+ const tui = sync.data.config.tui
+ if (tui?.scroll_acceleration?.enabled) {
+ return new MacOSScrollAccel()
+ }
+ if (tui?.scroll_speed) {
+ return new CustomSpeedScroll(tui.scroll_speed)
+ }
+ return undefined
+ })
+
createEffect(async () => {
await sync.session
.sync(route.sessionID)
@@ -695,6 +723,7 @@ export function Session() {
stickyScroll={true}
stickyStart="bottom"
flexGrow={1}
+ scrollAcceleration={scrollAcceleration()}
>
{(message, index) => (
@@ -1229,7 +1258,7 @@ ToolRegistry.register({
{(value) => {value}}
-
+ {closeButton()}
+
+ )}
+
+