+
+
+
+
+
+
+
+
{
+ if (e.target === e.currentTarget) mobileSidebar.hide()
+ }}
+ />
+
e.stopPropagation()}
+ >
+
+
{props.children}
diff --git a/packages/desktop/src/pages/session.tsx b/packages/desktop/src/pages/session.tsx
index dde5fa2ae..1f38da3c7 100644
--- a/packages/desktop/src/pages/session.tsx
+++ b/packages/desktop/src/pages/session.tsx
@@ -12,6 +12,7 @@ import {
createRenderEffect,
batch,
} from "solid-js"
+import { createResizeObserver } from "@solid-primitives/resize-observer"
import { Dynamic } from "solid-js/web"
import { useLocal, type LocalFile } from "@/context/local"
import { createStore } from "solid-js/store"
@@ -70,7 +71,6 @@ export default function Page() {
const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
const tabs = createMemo(() => layout.tabs(sessionKey()))
-
const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
const revertMessageID = createMemo(() => info()?.revert?.messageID)
const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))
@@ -79,7 +79,6 @@ export default function Page() {
.filter((m) => m.role === "user")
.sort((a, b) => a.id.localeCompare(b.id)),
)
- // Visible user messages excludes reverted messages (those >= revertMessageID)
const visibleUserMessages = createMemo(() => {
const revert = revertMessageID()
if (!revert) return userMessages()
@@ -87,15 +86,31 @@ export default function Page() {
})
const lastUserMessage = createMemo(() => visibleUserMessages()?.at(-1))
- const [messageStore, setMessageStore] = createStore<{ messageId?: string }>({})
+ const [store, setStore] = createStore({
+ clickTimer: undefined as number | undefined,
+ activeDraggable: undefined as string | undefined,
+ activeTerminalDraggable: undefined as string | undefined,
+ userInteracted: false,
+ stepsExpanded: true,
+ mobileStepsExpanded: {} as Record
,
+ mobileLastScrollTop: 0,
+ mobileLastScrollHeight: 0,
+ mobileAutoScrolled: false,
+ mobileUserScrolled: false,
+ mobileContentRef: undefined as HTMLDivElement | undefined,
+ mobileLastContentWidth: 0,
+ mobileReflowing: false,
+ messageId: undefined as string | undefined,
+ })
+
const activeMessage = createMemo(() => {
- if (!messageStore.messageId) return lastUserMessage()
+ if (!store.messageId) return lastUserMessage()
// If the stored message is no longer visible (e.g., was reverted), fall back to last visible
- const found = visibleUserMessages()?.find((m) => m.id === messageStore.messageId)
+ const found = visibleUserMessages()?.find((m) => m.id === store.messageId)
return found ?? lastUserMessage()
})
const setActiveMessage = (message: UserMessage | undefined) => {
- setMessageStore("messageId", message?.id)
+ setStore("messageId", message?.id)
}
function navigateMessageByOffset(offset: number) {
@@ -119,13 +134,6 @@ export default function Page() {
const diffs = createMemo(() => (params.id ? (sync.data.session_diff[params.id] ?? []) : []))
- const [store, setStore] = createStore({
- clickTimer: undefined as number | undefined,
- activeDraggable: undefined as string | undefined,
- activeTerminalDraggable: undefined as string | undefined,
- userInteracted: false,
- stepsExpanded: true,
- })
let inputRef!: HTMLDivElement
createEffect(() => {
@@ -146,7 +154,7 @@ export default function Page() {
() => visibleUserMessages().at(-1)?.id,
(lastId, prevLastId) => {
if (lastId && prevLastId && lastId > prevLastId) {
- setMessageStore("messageId", undefined)
+ setStore("messageId", undefined)
}
},
{ defer: true },
@@ -533,72 +541,231 @@ export default function Page() {
const showTabs = createMemo(() => diffs().length > 0 || tabs().all().length > 0)
+ let mobileScrollRef: HTMLDivElement | undefined
+ const mobileWorking = createMemo(() => status().type !== "idle")
+
+ function handleMobileScroll() {
+ if (!mobileScrollRef || store.mobileAutoScrolled) return
+
+ const scrollTop = mobileScrollRef.scrollTop
+ const scrollHeight = mobileScrollRef.scrollHeight
+
+ if (store.mobileReflowing) {
+ batch(() => {
+ setStore("mobileLastScrollTop", scrollTop)
+ setStore("mobileLastScrollHeight", scrollHeight)
+ })
+ return
+ }
+
+ const scrolledUp = scrollTop < store.mobileLastScrollTop - 50
+ if (scrolledUp && mobileWorking()) {
+ setStore("mobileUserScrolled", true)
+ setStore("userInteracted", true)
+ }
+
+ batch(() => {
+ setStore("mobileLastScrollTop", scrollTop)
+ setStore("mobileLastScrollHeight", scrollHeight)
+ })
+ }
+
+ function handleMobileInteraction() {
+ if (mobileWorking()) {
+ setStore("mobileUserScrolled", true)
+ setStore("userInteracted", true)
+ }
+ }
+
+ function scrollMobileToBottom() {
+ if (!mobileScrollRef || store.mobileUserScrolled || !mobileWorking()) return
+ setStore("mobileAutoScrolled", true)
+ requestAnimationFrame(() => {
+ mobileScrollRef?.scrollTo({ top: mobileScrollRef.scrollHeight, behavior: "smooth" })
+ requestAnimationFrame(() => {
+ batch(() => {
+ setStore("mobileLastScrollTop", mobileScrollRef?.scrollTop ?? 0)
+ setStore("mobileLastScrollHeight", mobileScrollRef?.scrollHeight ?? 0)
+ setStore("mobileAutoScrolled", false)
+ })
+ })
+ })
+ }
+
+ createEffect(() => {
+ if (!mobileWorking()) setStore("mobileUserScrolled", false)
+ })
+
+ createResizeObserver(
+ () => store.mobileContentRef,
+ ({ width }) => {
+ const widthChanged = Math.abs(width - store.mobileLastContentWidth) > 5
+ if (widthChanged && store.mobileLastContentWidth > 0) {
+ setStore("mobileReflowing", true)
+ requestAnimationFrame(() => {
+ requestAnimationFrame(() => {
+ setStore("mobileReflowing", false)
+ if (mobileWorking() && !store.mobileUserScrolled) {
+ scrollMobileToBottom()
+ }
+ })
+ })
+ } else if (!store.mobileReflowing) {
+ scrollMobileToBottom()
+ }
+ setStore("mobileLastContentWidth", width)
+ },
+ )
+
+ const MobileTurns = () => (
+
+ )
+
+ const NewSessionView = () => (
+
+
New session
+
+
+
+ {getDirectory(sync.data.path.directory)}
+ {getFilename(sync.data.path.directory)}
+
+
+
+ {(project) => (
+
+
+
+ Last modified
+
+ {DateTime.fromMillis(project().time.updated ?? project().time.created).toRelative()}
+
+
+
+
+
+
+ setStore("stepsExpanded", (x) => !x)}
+ onUserInteracted={() => setStore("userInteracted", true)}
+ classes={{
+ root: "pb-20 flex-1 min-w-0",
+ content: "pb-20",
+ container:
+ "w-full " +
+ (!showTabs() ? "max-w-200 mx-auto px-6" : visibleUserMessages().length > 1 ? "pr-6 pl-18" : "px-6"),
+ }}
+ />
+
+
+
+
+
+
+
+ )
+
return (
-
- {/* Session pane - always visible */}
+
+
+
+
+
+
+
+ 0}>
+
+
+
+ Session
+
+
+ {diffs().length} Files Changed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ inputRef = el
+ }}
+ />
+
+
+
+
+
-
-
-
-
-
- setStore("stepsExpanded", (x) => !x)}
- onUserInteracted={() => setStore("userInteracted", true)}
- classes={{
- root: "pb-20 flex-1 min-w-0",
- content: "pb-20",
- container:
- "w-full " +
- (!showTabs()
- ? "max-w-200 mx-auto px-6"
- : visibleUserMessages().length > 1
- ? "pr-6 pl-18"
- : "px-6"),
- }}
- />
-
-
-
-
-
-
New session
-
-
-
- {getDirectory(sync.data.path.directory)}
- {getFilename(sync.data.path.directory)}
-
-
-
- {(project) => (
-
-
-
- Last modified
-
- {DateTime.fromMillis(project().time.updated ?? project().time.created).toRelative()}
-
-
-
-
+
- {/* Tabs pane - visible when there are diffs or file tabs */}
-
+
+
{
if (process.platform !== "win32") {
- await $`chmod 755 -R .`.cwd(`./dist/${name}`)
+ await $`chmod -R 755 .`.cwd(`./dist/${name}`)
}
await $`bun pm pack`.cwd(`./dist/${name}`)
for (const tag of tags) {
diff --git a/packages/opencode/src/flag/flag.ts b/packages/opencode/src/flag/flag.ts
index 412377693..805da33cc 100644
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -30,6 +30,7 @@ export namespace Flag {
export const OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX = number("OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX")
export const OPENCODE_EXPERIMENTAL_OXFMT = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_OXFMT")
export const OPENCODE_EXPERIMENTAL_LSP_TY = truthy("OPENCODE_EXPERIMENTAL_LSP_TY")
+ export const OPENCODE_EXPERIMENTAL_LSP_TOOL = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_LSP_TOOL")
function truthy(key: string) {
const value = process.env[key]?.toLowerCase()
diff --git a/packages/opencode/src/installation/index.ts b/packages/opencode/src/installation/index.ts
index 0359c16fe..2c99e21a8 100644
--- a/packages/opencode/src/installation/index.ts
+++ b/packages/opencode/src/installation/index.ts
@@ -1,5 +1,4 @@
import { BusEvent } from "@/bus/bus-event"
-import { Bus } from "@/bus"
import path from "path"
import { $ } from "bun"
import z from "zod"
@@ -66,23 +65,23 @@ export namespace Installation {
const checks = [
{
name: "npm" as const,
- command: () => $`npm list -g --depth=0`.throws(false).text(),
+ command: () => $`npm list -g --depth=0`.throws(false).quiet().text(),
},
{
name: "yarn" as const,
- command: () => $`yarn global list`.throws(false).text(),
+ command: () => $`yarn global list`.throws(false).quiet().text(),
},
{
name: "pnpm" as const,
- command: () => $`pnpm list -g --depth=0`.throws(false).text(),
+ command: () => $`pnpm list -g --depth=0`.throws(false).quiet().text(),
},
{
name: "bun" as const,
- command: () => $`bun pm ls -g`.throws(false).text(),
+ command: () => $`bun pm ls -g`.throws(false).quiet().text(),
},
{
name: "brew" as const,
- command: () => $`brew list --formula opencode`.throws(false).text(),
+ command: () => $`brew list --formula opencode`.throws(false).quiet().text(),
},
]
@@ -112,9 +111,9 @@ export namespace Installation {
)
async function getBrewFormula() {
- const tapFormula = await $`brew list --formula sst/tap/opencode`.throws(false).text()
+ const tapFormula = await $`brew list --formula sst/tap/opencode`.throws(false).quiet().text()
if (tapFormula.includes("opencode")) return "sst/tap/opencode"
- const coreFormula = await $`brew list --formula opencode`.throws(false).text()
+ const coreFormula = await $`brew list --formula opencode`.throws(false).quiet().text()
if (coreFormula.includes("opencode")) return "opencode"
return "opencode"
}
diff --git a/packages/opencode/src/lsp/index.ts b/packages/opencode/src/lsp/index.ts
index 1d52aefcb..0fd3b69df 100644
--- a/packages/opencode/src/lsp/index.ts
+++ b/packages/opencode/src/lsp/index.ts
@@ -261,23 +261,36 @@ export namespace LSP {
return result
}
+ export async function hasClients(file: string) {
+ const s = await state()
+ const extension = path.parse(file).ext || file
+ for (const server of Object.values(s.servers)) {
+ if (server.extensions.length && !server.extensions.includes(extension)) continue
+ const root = await server.root(file)
+ if (!root) continue
+ if (s.broken.has(root + server.id)) continue
+ return true
+ }
+ return false
+ }
+
export async function touchFile(input: string, waitForDiagnostics?: boolean) {
log.info("touching file", { file: input })
const clients = await getClients(input)
- await run(async (client) => {
- if (!clients.includes(client)) return
- const wait = waitForDiagnostics ? client.waitForDiagnostics({ path: input }) : Promise.resolve()
- await client.notify.open({ path: input })
-
- return wait
- }).catch((err) => {
+ await Promise.all(
+ clients.map(async (client) => {
+ const wait = waitForDiagnostics ? client.waitForDiagnostics({ path: input }) : Promise.resolve()
+ await client.notify.open({ path: input })
+ return wait
+ }),
+ ).catch((err) => {
log.error("failed to touch file", { err, file: input })
})
}
export async function diagnostics() {
const results: Record = {}
- for (const result of await run(async (client) => client.diagnostics)) {
+ for (const result of await runAll(async (client) => client.diagnostics)) {
for (const [path, diagnostics] of result.entries()) {
const arr = results[path] || []
arr.push(...diagnostics)
@@ -288,16 +301,18 @@ export namespace LSP {
}
export async function hover(input: { file: string; line: number; character: number }) {
- return run((client) => {
- return client.connection.sendRequest("textDocument/hover", {
- textDocument: {
- uri: pathToFileURL(input.file).href,
- },
- position: {
- line: input.line,
- character: input.character,
- },
- })
+ return run(input.file, (client) => {
+ return client.connection
+ .sendRequest("textDocument/hover", {
+ textDocument: {
+ uri: pathToFileURL(input.file).href,
+ },
+ position: {
+ line: input.line,
+ character: input.character,
+ },
+ })
+ .catch(() => null)
})
}
@@ -342,7 +357,7 @@ export namespace LSP {
]
export async function workspaceSymbol(query: string) {
- return run((client) =>
+ return runAll((client) =>
client.connection
.sendRequest("workspace/symbol", {
query,
@@ -354,7 +369,8 @@ export namespace LSP {
}
export async function documentSymbol(uri: string) {
- return run((client) =>
+ const file = new URL(uri).pathname
+ return run(file, (client) =>
client.connection
.sendRequest("textDocument/documentSymbol", {
textDocument: {
@@ -367,12 +383,89 @@ export namespace LSP {
.then((result) => result.filter(Boolean))
}
- async function run(input: (client: LSPClient.Info) => Promise): Promise {
+ export async function definition(input: { file: string; line: number; character: number }) {
+ return run(input.file, (client) =>
+ client.connection
+ .sendRequest("textDocument/definition", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ })
+ .catch(() => null),
+ ).then((result) => result.flat().filter(Boolean))
+ }
+
+ export async function references(input: { file: string; line: number; character: number }) {
+ return run(input.file, (client) =>
+ client.connection
+ .sendRequest("textDocument/references", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ context: { includeDeclaration: true },
+ })
+ .catch(() => []),
+ ).then((result) => result.flat().filter(Boolean))
+ }
+
+ export async function implementation(input: { file: string; line: number; character: number }) {
+ return run(input.file, (client) =>
+ client.connection
+ .sendRequest("textDocument/implementation", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ })
+ .catch(() => null),
+ ).then((result) => result.flat().filter(Boolean))
+ }
+
+ export async function prepareCallHierarchy(input: { file: string; line: number; character: number }) {
+ return run(input.file, (client) =>
+ client.connection
+ .sendRequest("textDocument/prepareCallHierarchy", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ })
+ .catch(() => []),
+ ).then((result) => result.flat().filter(Boolean))
+ }
+
+ export async function incomingCalls(input: { file: string; line: number; character: number }) {
+ return run(input.file, async (client) => {
+ const items = (await client.connection
+ .sendRequest("textDocument/prepareCallHierarchy", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ })
+ .catch(() => [])) as any[]
+ if (!items?.length) return []
+ return client.connection.sendRequest("callHierarchy/incomingCalls", { item: items[0] }).catch(() => [])
+ }).then((result) => result.flat().filter(Boolean))
+ }
+
+ export async function outgoingCalls(input: { file: string; line: number; character: number }) {
+ return run(input.file, async (client) => {
+ const items = (await client.connection
+ .sendRequest("textDocument/prepareCallHierarchy", {
+ textDocument: { uri: pathToFileURL(input.file).href },
+ position: { line: input.line, character: input.character },
+ })
+ .catch(() => [])) as any[]
+ if (!items?.length) return []
+ return client.connection.sendRequest("callHierarchy/outgoingCalls", { item: items[0] }).catch(() => [])
+ }).then((result) => result.flat().filter(Boolean))
+ }
+
+ async function runAll(input: (client: LSPClient.Info) => Promise): Promise {
const clients = await state().then((x) => x.clients)
const tasks = clients.map((x) => input(x))
return Promise.all(tasks)
}
+ async function run(file: string, input: (client: LSPClient.Info) => Promise): Promise {
+ const clients = await getClients(file)
+ const tasks = clients.map((x) => input(x))
+ return Promise.all(tasks)
+ }
+
export namespace Diagnostic {
export function pretty(diagnostic: LSPClient.Diagnostic) {
const severityMap = {
diff --git a/packages/opencode/src/lsp/language.ts b/packages/opencode/src/lsp/language.ts
index d95966d39..12792c7c2 100644
--- a/packages/opencode/src/lsp/language.ts
+++ b/packages/opencode/src/lsp/language.ts
@@ -110,4 +110,5 @@ export const LANGUAGE_EXTENSIONS: Record = {
".tf": "terraform",
".tfvars": "terraform-vars",
".hcl": "hcl",
+ ".nix": "nix",
} as const
diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts
index 0551808ac..9390259a8 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -1746,4 +1746,35 @@ export namespace LSPServer {
}
},
}
+
+ export const Nixd: Info = {
+ id: "nixd",
+ extensions: [".nix"],
+ root: async (file) => {
+ // First, look for flake.nix - the most reliable Nix project root indicator
+ const flakeRoot = await NearestRoot(["flake.nix"])(file)
+ if (flakeRoot && flakeRoot !== Instance.directory) return flakeRoot
+
+ // If no flake.nix, fall back to git repository root
+ if (Instance.worktree && Instance.worktree !== Instance.directory) return Instance.worktree
+
+ // Finally, use the instance directory as fallback
+ return Instance.directory
+ },
+ async spawn(root) {
+ const nixd = Bun.which("nixd")
+ if (!nixd) {
+ log.info("nixd not found, please install nixd first")
+ return
+ }
+ return {
+ process: spawn(nixd, [], {
+ cwd: root,
+ env: {
+ ...process.env,
+ },
+ }),
+ }
+ },
+ }
}
diff --git a/packages/opencode/src/tool/lsp.ts b/packages/opencode/src/tool/lsp.ts
new file mode 100644
index 000000000..2a15ed7e3
--- /dev/null
+++ b/packages/opencode/src/tool/lsp.ts
@@ -0,0 +1,87 @@
+import z from "zod"
+import { Tool } from "./tool"
+import path from "path"
+import { LSP } from "../lsp"
+import DESCRIPTION from "./lsp.txt"
+import { Instance } from "../project/instance"
+import { pathToFileURL } from "url"
+
+const operations = [
+ "goToDefinition",
+ "findReferences",
+ "hover",
+ "documentSymbol",
+ "workspaceSymbol",
+ "goToImplementation",
+ "prepareCallHierarchy",
+ "incomingCalls",
+ "outgoingCalls",
+] as const
+
+export const LspTool = Tool.define("lsp", {
+ description: DESCRIPTION,
+ parameters: z.object({
+ operation: z.enum(operations).describe("The LSP operation to perform"),
+ filePath: z.string().describe("The absolute or relative path to the file"),
+ line: z.number().int().min(1).describe("The line number (1-based, as shown in editors)"),
+ character: z.number().int().min(1).describe("The character offset (1-based, as shown in editors)"),
+ }),
+ execute: async (args) => {
+ const file = path.isAbsolute(args.filePath) ? args.filePath : path.join(Instance.directory, args.filePath)
+ const uri = pathToFileURL(file).href
+ const position = {
+ file,
+ line: args.line - 1,
+ character: args.character - 1,
+ }
+
+ const relPath = path.relative(Instance.worktree, file)
+ const title = `${args.operation} ${relPath}:${args.line}:${args.character}`
+
+ const exists = await Bun.file(file).exists()
+ if (!exists) {
+ throw new Error(`File not found: ${file}`)
+ }
+
+ const available = await LSP.hasClients(file)
+ if (!available) {
+ throw new Error("No LSP server available for this file type.")
+ }
+
+ await LSP.touchFile(file, true)
+
+ const result: unknown[] = await (async () => {
+ switch (args.operation) {
+ case "goToDefinition":
+ return LSP.definition(position)
+ case "findReferences":
+ return LSP.references(position)
+ case "hover":
+ return LSP.hover(position)
+ case "documentSymbol":
+ return LSP.documentSymbol(uri)
+ case "workspaceSymbol":
+ return LSP.workspaceSymbol("")
+ case "goToImplementation":
+ return LSP.implementation(position)
+ case "prepareCallHierarchy":
+ return LSP.prepareCallHierarchy(position)
+ case "incomingCalls":
+ return LSP.incomingCalls(position)
+ case "outgoingCalls":
+ return LSP.outgoingCalls(position)
+ }
+ })()
+
+ const output = (() => {
+ if (result.length === 0) return `No results found for ${args.operation}`
+ return JSON.stringify(result, null, 2)
+ })()
+
+ return {
+ title,
+ metadata: { result },
+ output,
+ }
+ },
+})
diff --git a/packages/opencode/src/tool/lsp.txt b/packages/opencode/src/tool/lsp.txt
new file mode 100644
index 000000000..5a50a571b
--- /dev/null
+++ b/packages/opencode/src/tool/lsp.txt
@@ -0,0 +1,19 @@
+Interact with Language Server Protocol (LSP) servers to get code intelligence features.
+
+Supported operations:
+- goToDefinition: Find where a symbol is defined
+- findReferences: Find all references to a symbol
+- hover: Get hover information (documentation, type info) for a symbol
+- documentSymbol: Get all symbols (functions, classes, variables) in a document
+- workspaceSymbol: Search for symbols across the entire workspace
+- goToImplementation: Find implementations of an interface or abstract method
+- prepareCallHierarchy: Get call hierarchy item at a position (functions/methods)
+- incomingCalls: Find all functions/methods that call the function at a position
+- outgoingCalls: Find all functions/methods called by the function at a position
+
+All operations require:
+- filePath: The file to operate on
+- line: The line number (1-based, as shown in editors)
+- character: The character offset (1-based, as shown in editors)
+
+Note: LSP servers must be configured for the file type. If no server is available, an error will be returned.
diff --git a/packages/opencode/src/tool/read.ts b/packages/opencode/src/tool/read.ts
index 27426ad24..fd81c4864 100644
--- a/packages/opencode/src/tool/read.ts
+++ b/packages/opencode/src/tool/read.ts
@@ -60,10 +60,12 @@ export const ReadTool = Tool.define("read", {
}
const block = iife(() => {
- const whitelist = [".env.sample", ".example"]
+ const basename = path.basename(filepath)
+ const whitelist = [".env.sample", ".env.example", ".example", ".env.template"]
- if (whitelist.some((w) => filepath.endsWith(w))) return false
- if (filepath.includes(".env")) return true
+ if (whitelist.some((w) => basename.endsWith(w))) return false
+ // Block .env, .env.local, .env.production, etc. but not .envrc
+ if (/^\.env(\.|$)/.test(basename)) return true
return false
})
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 647c74267..3a695f45f 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -22,6 +22,7 @@ import { WebSearchTool } from "./websearch"
import { CodeSearchTool } from "./codesearch"
import { Flag } from "@/flag/flag"
import { Log } from "@/util/log"
+import { LspTool } from "./lsp"
export namespace ToolRegistry {
const log = Log.create({ service: "tool.registry" })
@@ -102,6 +103,7 @@ export namespace ToolRegistry {
TodoReadTool,
WebSearchTool,
CodeSearchTool,
+ ...(Flag.OPENCODE_EXPERIMENTAL_LSP_TOOL ? [LspTool] : []),
...(config.experimental?.batch_tool === true ? [BatchTool] : []),
...custom,
]
diff --git a/packages/opencode/test/tool/read.test.ts b/packages/opencode/test/tool/read.test.ts
new file mode 100644
index 000000000..47a7aee2a
--- /dev/null
+++ b/packages/opencode/test/tool/read.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, test } from "bun:test"
+import path from "path"
+import { ReadTool } from "../../src/tool/read"
+import { Instance } from "../../src/project/instance"
+import { tmpdir } from "../fixture/fixture"
+
+const ctx = {
+ sessionID: "test",
+ messageID: "",
+ callID: "",
+ agent: "build",
+ abort: AbortSignal.any([]),
+ metadata: () => {},
+}
+
+describe("tool.read env file blocking", () => {
+ test.each([
+ [".env", true],
+ [".env.local", true],
+ [".env.production", true],
+ [".env.sample", false],
+ [".env.example", false],
+ [".envrc", false],
+ ["environment.ts", false],
+ ])("%s blocked=%s", async (filename, blocked) => {
+ await using tmp = await tmpdir({
+ init: (dir) => Bun.write(path.join(dir, filename), "content"),
+ })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const read = await ReadTool.init()
+ const promise = read.execute({ filePath: path.join(tmp.path, filename) }, ctx)
+ if (blocked) {
+ await expect(promise).rejects.toThrow("blocked")
+ } else {
+ expect((await promise).output).toContain("content")
+ }
+ },
+ })
+ })
+})
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 0b1ba7886..9da158f1d 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/plugin",
- "version": "1.0.185",
+ "version": "1.0.186",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 2ad892d9a..81498a60f 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/sdk",
- "version": "1.0.185",
+ "version": "1.0.186",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index b9259ae62..1d85ced4e 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/slack",
- "version": "1.0.185",
+ "version": "1.0.186",
"type": "module",
"scripts": {
"dev": "bun run src/index.ts",
diff --git a/packages/tauri/package.json b/packages/tauri/package.json
index f198e87f5..ff068c65a 100644
--- a/packages/tauri/package.json
+++ b/packages/tauri/package.json
@@ -1,7 +1,7 @@
{
"name": "@opencode-ai/tauri",
"private": true,
- "version": "1.0.185",
+ "version": "1.0.186",
"type": "module",
"scripts": {
"typecheck": "tsgo -b",
diff --git a/packages/tauri/scripts/prepare.ts b/packages/tauri/scripts/prepare.ts
index 692e0dd78..495a0baea 100755
--- a/packages/tauri/scripts/prepare.ts
+++ b/packages/tauri/scripts/prepare.ts
@@ -1,21 +1,15 @@
#!/usr/bin/env bun
-
import { $ } from "bun"
import { copyBinaryToSidecarFolder, getCurrentSidecar } from "./utils"
-import { Script } from "@opencode-ai/script"
const sidecarConfig = getCurrentSidecar()
const dir = "src-tauri/target/opencode-binaries"
await $`mkdir -p ${dir}`
-await $`gh release download v${Script.version} --pattern ${sidecarConfig.ocBinary}.${sidecarConfig.assetExt} --repo sst/opencode --skip-existing --dir ${dir}`
+await $`gh run download ${Bun.env.GITHUB_RUN_ID} -n opencode-cli`.cwd(dir)
-if (sidecarConfig.assetExt === "tar.gz") {
- await $`tar -xvzf ${dir}/${sidecarConfig.ocBinary}.${sidecarConfig.assetExt} -C ${dir}`
-} else {
- await $`unzip -o ${dir}/${sidecarConfig.ocBinary}.${sidecarConfig.assetExt} -d ${dir}`
-}
-
-await copyBinaryToSidecarFolder(`${dir}/opencode${process.platform === "win32" ? ".exe" : ""}`)
+await copyBinaryToSidecarFolder(
+ `${dir}/${sidecarConfig.ocBinary}/bin/opencode${process.platform === "win32" ? ".exe" : ""}`,
+)
diff --git a/packages/tauri/scripts/utils.ts b/packages/tauri/scripts/utils.ts
index 3e74346c8..885d0afce 100644
--- a/packages/tauri/scripts/utils.ts
+++ b/packages/tauri/scripts/utils.ts
@@ -21,6 +21,11 @@ export const SIDECAR_BINARIES: Array<{ rustTarget: string; ocBinary: string; ass
ocBinary: "opencode-linux-x64",
assetExt: "tar.gz",
},
+ {
+ rustTarget: "aarch64-unknown-linux-gnu",
+ ocBinary: "opencode-linux-arm64",
+ assetExt: "tar.gz",
+ },
]
export const RUST_TARGET = Bun.env.RUST_TARGET
diff --git a/packages/tauri/src-tauri/tauri.conf.json b/packages/tauri/src-tauri/tauri.conf.json
index b6737d383..bcb067a32 100644
--- a/packages/tauri/src-tauri/tauri.conf.json
+++ b/packages/tauri/src-tauri/tauri.conf.json
@@ -26,7 +26,7 @@
"icons/dev/icon.ico"
],
"active": true,
- "targets": ["deb", "rpm", "dmg", "nsis", "app"],
+ "targets": ["deb", "rpm", "dmg", "nsis", "app", "appimage"],
"externalBin": ["sidecars/opencode-cli"],
"macOS": {
"entitlements": "./entitlements.plist"
diff --git a/packages/ui/package.json b/packages/ui/package.json
index ab5a8d575..f1fd5b9d8 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/ui",
- "version": "1.0.185",
+ "version": "1.0.186",
"type": "module",
"exports": {
"./*": "./src/components/*.tsx",
diff --git a/packages/ui/src/assets/icons/provider/aihubmix.svg b/packages/ui/src/assets/icons/provider/aihubmix.svg
index 39d6a7dc5..33164b78b 100644
--- a/packages/ui/src/assets/icons/provider/aihubmix.svg
+++ b/packages/ui/src/assets/icons/provider/aihubmix.svg
@@ -1,3 +1,3 @@
-