diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 540046c09b..29fed369e3 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -681,7 +681,7 @@ export default function Page() {
{
id: "file.open",
title: language.t("command.file.open"),
- description: language.t("command.file.open.description"),
+ description: language.t("palette.search.placeholder"),
category: language.t("command.category.file"),
keybind: "mod+p",
slash: "open",
@@ -1950,7 +1950,7 @@ export default function Page() {
"sticky top-0 z-30 bg-background-stronger": true,
"w-full": true,
"px-4 md:px-6": true,
- "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 3xl:mx-auto 4xl:max-w-[1600px] 4xl:mx-auto 5xl:max-w-[1900px] 5xl:mx-auto":
+ "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 4xl:max-w-[1600px] 5xl:max-w-[1900px]":
centered(),
}}
>
@@ -1976,10 +1976,10 @@ export default function Page() {
sum + r.count, 0)
logger.debug(`rate limit total: ${total}`)
- if (total >= limit.value) throw new RateLimitError(`Rate limit exceeded. Please try again later.`)
+ if (total >= limitValue) throw new RateLimitError(`Rate limit exceeded. Please try again later.`)
},
}
}
diff --git a/packages/console/core/package.json b/packages/console/core/package.json
index d110dc117b..e2ad1ac95f 100644
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/console-core",
- "version": "1.1.48",
+ "version": "1.1.49",
"private": true,
"type": "module",
"license": "MIT",
diff --git a/packages/console/core/src/model.ts b/packages/console/core/src/model.ts
index fc9674cedb..6b06f275d4 100644
--- a/packages/console/core/src/model.ts
+++ b/packages/console/core/src/model.ts
@@ -21,6 +21,8 @@ export namespace ZenData {
const RateLimitSchema = z.object({
period: z.enum(["day", "rolling"]),
value: z.number().int(),
+ checkHeader: z.string().optional(),
+ fallbackValue: z.number().int().optional(),
})
export type Format = z.infer
export type Trial = z.infer
diff --git a/packages/console/function/package.json b/packages/console/function/package.json
index e04aa5e310..6acecac63b 100644
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-function",
- "version": "1.1.48",
+ "version": "1.1.49",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/console/mail/package.json b/packages/console/mail/package.json
index 1f69a0c75c..122f362ad6 100644
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-mail",
- "version": "1.1.48",
+ "version": "1.1.49",
"dependencies": {
"@jsx-email/all": "2.2.3",
"@jsx-email/cli": "1.4.3",
diff --git a/packages/desktop/index.html b/packages/desktop/index.html
index a5a8c2571f..6a81ef4a50 100644
--- a/packages/desktop/index.html
+++ b/packages/desktop/index.html
@@ -17,7 +17,7 @@
-
+
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 4f60bd58a2..946822542d 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
{
"name": "@opencode-ai/desktop",
"private": true,
- "version": "1.1.48",
+ "version": "1.1.49",
"type": "module",
"license": "MIT",
"scripts": {
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index 4e901e23e2..fa6b070b16 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/enterprise",
- "version": "1.1.48",
+ "version": "1.1.49",
"private": true,
"type": "module",
"license": "MIT",
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index 576d6bbcd9..9e8689280c 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
id = "opencode"
name = "OpenCode"
description = "The open source coding agent."
-version = "1.1.48"
+version = "1.1.49"
schema_version = 1
authors = ["Anomaly"]
repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
icon = "./icons/opencode.svg"
[agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.49/opencode-darwin-arm64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.49/opencode-darwin-x64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.49/opencode-linux-arm64.tar.gz"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.49/opencode-linux-x64.tar.gz"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.49/opencode-windows-x64.zip"
cmd = "./opencode.exe"
args = ["acp"]
diff --git a/packages/function/package.json b/packages/function/package.json
index 88792e1e6a..062e0bfcb0 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/function",
- "version": "1.1.48",
+ "version": "1.1.49",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index cc0e84d9f2..7dd0cbd272 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
- "version": "1.1.48",
+ "version": "1.1.49",
"name": "opencode",
"type": "module",
"license": "MIT",
@@ -20,6 +20,7 @@
"bin": {
"opencode": "./bin/opencode"
},
+ "randomField": "this-is-a-random-value-12345",
"exports": {
"./*": "./src/*.ts"
},
@@ -91,6 +92,7 @@
"@standard-schema/spec": "1.0.0",
"@zip.js/zip.js": "2.7.62",
"ai": "catalog:",
+ "ai-gateway-provider": "2.3.1",
"bonjour-service": "1.3.0",
"bun-pty": "0.4.4",
"chokidar": "4.0.3",
diff --git a/packages/opencode/script/publish.ts b/packages/opencode/script/publish.ts
index 5fc4f3c711..3113a85003 100755
--- a/packages/opencode/script/publish.ts
+++ b/packages/opencode/script/publish.ts
@@ -18,6 +18,7 @@ const version = Object.values(binaries)[0]
await $`mkdir -p ./dist/${pkg.name}`
await $`cp -r ./bin ./dist/${pkg.name}/bin`
await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
+await Bun.file(`./dist/${pkg.name}/LICENSE`).write(await Bun.file("../../LICENSE").text())
await Bun.file(`./dist/${pkg.name}/package.json`).write(
JSON.stringify(
@@ -30,6 +31,7 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
postinstall: "bun ./postinstall.mjs || node ./postinstall.mjs",
},
version: version,
+ license: pkg.license,
optionalDependencies: binaries,
},
null,
diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts
index 0eaa410e0f..e338559be7 100644
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -18,6 +18,7 @@ import { mergeDeep, pipe, sortBy, values } from "remeda"
import { Global } from "@/global"
import path from "path"
import { Plugin } from "@/plugin"
+import { Skill } from "../skill"
export namespace Agent {
export const Info = z
@@ -50,12 +51,14 @@ export namespace Agent {
const state = Instance.state(async () => {
const cfg = await Config.get()
+ const skillDirs = await Skill.dirs()
const defaults = PermissionNext.fromConfig({
"*": "allow",
doom_loop: "ask",
external_directory: {
"*": "ask",
[Truncate.GLOB]: "allow",
+ ...Object.fromEntries(skillDirs.map((dir) => [path.join(dir, "*"), "allow"])),
},
question: "deny",
plan_enter: "deny",
diff --git a/packages/opencode/src/bun/index.ts b/packages/opencode/src/bun/index.ts
index 8d061aed56..19edb6eec4 100644
--- a/packages/opencode/src/bun/index.ts
+++ b/packages/opencode/src/bun/index.ts
@@ -6,6 +6,7 @@ import { Filesystem } from "../util/filesystem"
import { NamedError } from "@opencode-ai/util/error"
import { readableStreamToText } from "bun"
import { Lock } from "../util/lock"
+import { PackageRegistry } from "./registry"
export namespace BunProc {
const log = Log.create({ service: "bun" })
@@ -73,7 +74,17 @@ export namespace BunProc {
const dependencies = parsed.dependencies ?? {}
if (!parsed.dependencies) parsed.dependencies = dependencies
const modExists = await Filesystem.exists(mod)
- if (dependencies[pkg] === version && modExists) return mod
+ const cachedVersion = dependencies[pkg]
+
+ if (!modExists || !cachedVersion) {
+ // continue to install
+ } else if (version !== "latest" && cachedVersion === version) {
+ return mod
+ } else if (version === "latest") {
+ const isOutdated = await PackageRegistry.isOutdated(pkg, cachedVersion, Global.Path.cache)
+ if (!isOutdated) return mod
+ log.info("Cached version is outdated, proceeding with install", { pkg, cachedVersion })
+ }
const proxied = !!(
process.env.HTTP_PROXY ||
diff --git a/packages/opencode/src/bun/registry.ts b/packages/opencode/src/bun/registry.ts
new file mode 100644
index 0000000000..c567668acd
--- /dev/null
+++ b/packages/opencode/src/bun/registry.ts
@@ -0,0 +1,48 @@
+import { readableStreamToText, semver } from "bun"
+import { Log } from "../util/log"
+
+export namespace PackageRegistry {
+ const log = Log.create({ service: "bun" })
+
+ function which() {
+ return process.execPath
+ }
+
+ export async function info(pkg: string, field: string, cwd?: string): Promise {
+ const result = Bun.spawn([which(), "info", pkg, field], {
+ cwd,
+ stdout: "pipe",
+ stderr: "pipe",
+ env: {
+ ...process.env,
+ BUN_BE_BUN: "1",
+ },
+ })
+
+ const code = await result.exited
+ const stdout = result.stdout ? await readableStreamToText(result.stdout) : ""
+ const stderr = result.stderr ? await readableStreamToText(result.stderr) : ""
+
+ if (code !== 0) {
+ log.warn("bun info failed", { pkg, field, code, stderr })
+ return null
+ }
+
+ const value = stdout.trim()
+ if (!value) return null
+ return value
+ }
+
+ export async function isOutdated(pkg: string, cachedVersion: string, cwd?: string): Promise {
+ const latestVersion = await info(pkg, "version", cwd)
+ if (!latestVersion) {
+ log.warn("Failed to resolve latest version, using cached", { pkg, cachedVersion })
+ return false
+ }
+
+ const isRange = /[\s^~*xX<>|=]/.test(cachedVersion)
+ if (isRange) return !semver.satisfies(latestVersion, cachedVersion)
+
+ return semver.order(cachedVersion, latestVersion) === -1
+ }
+}
diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index 54248f96f3..6960ffd553 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -4,25 +4,211 @@ import { UI } from "../ui"
import { cmd } from "./cmd"
import { Flag } from "../../flag/flag"
import { bootstrap } from "../bootstrap"
-import { Command } from "../../command"
import { EOL } from "os"
-import { select } from "@clack/prompts"
-import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v2"
+import { createOpencodeClient, type Message, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
import { Server } from "../../server/server"
import { Provider } from "../../provider/provider"
import { Agent } from "../../agent/agent"
+import { PermissionNext } from "../../permission/next"
+import { Tool } from "../../tool/tool"
+import { GlobTool } from "../../tool/glob"
+import { GrepTool } from "../../tool/grep"
+import { ListTool } from "../../tool/ls"
+import { ReadTool } from "../../tool/read"
+import { WebFetchTool } from "../../tool/webfetch"
+import { EditTool } from "../../tool/edit"
+import { WriteTool } from "../../tool/write"
+import { CodeSearchTool } from "../../tool/codesearch"
+import { WebSearchTool } from "../../tool/websearch"
+import { TaskTool } from "../../tool/task"
+import { SkillTool } from "../../tool/skill"
+import { BashTool } from "../../tool/bash"
+import { TodoWriteTool } from "../../tool/todo"
+import { Locale } from "../../util/locale"
-const TOOL: Record = {
- todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
- todoread: ["Todo", UI.Style.TEXT_WARNING_BOLD],
- bash: ["Bash", UI.Style.TEXT_DANGER_BOLD],
- edit: ["Edit", UI.Style.TEXT_SUCCESS_BOLD],
- glob: ["Glob", UI.Style.TEXT_INFO_BOLD],
- grep: ["Grep", UI.Style.TEXT_INFO_BOLD],
- list: ["List", UI.Style.TEXT_INFO_BOLD],
- read: ["Read", UI.Style.TEXT_HIGHLIGHT_BOLD],
- write: ["Write", UI.Style.TEXT_SUCCESS_BOLD],
- websearch: ["Search", UI.Style.TEXT_DIM_BOLD],
+type ToolProps = {
+ input: Tool.InferParameters
+ metadata: Tool.InferMetadata
+ part: ToolPart
+}
+
+function props(part: ToolPart): ToolProps {
+ const state = part.state
+ return {
+ input: state.input as Tool.InferParameters,
+ metadata: ("metadata" in state ? state.metadata : {}) as Tool.InferMetadata,
+ part,
+ }
+}
+
+type Inline = {
+ icon: string
+ title: string
+ description?: string
+}
+
+function inline(info: Inline) {
+ const suffix = info.description ? UI.Style.TEXT_DIM + ` ${info.description}` + UI.Style.TEXT_NORMAL : ""
+ UI.println(UI.Style.TEXT_NORMAL + info.icon, UI.Style.TEXT_NORMAL + info.title + suffix)
+}
+
+function block(info: Inline, output?: string) {
+ UI.empty()
+ inline(info)
+ if (!output?.trim()) return
+ UI.println(output)
+ UI.empty()
+}
+
+function fallback(part: ToolPart) {
+ const state = part.state
+ const input = "input" in state ? state.input : undefined
+ const title =
+ ("title" in state && state.title ? state.title : undefined) ||
+ (input && typeof input === "object" && Object.keys(input).length > 0 ? JSON.stringify(input) : "Unknown")
+ inline({
+ icon: "⚙",
+ title: `${part.tool} ${title}`,
+ })
+}
+
+function glob(info: ToolProps) {
+ const root = info.input.path ?? ""
+ const title = `Glob "${info.input.pattern}"`
+ const suffix = root ? `in ${normalizePath(root)}` : ""
+ const num = info.metadata.count
+ const description =
+ num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
+ inline({
+ icon: "✱",
+ title,
+ ...(description && { description }),
+ })
+}
+
+function grep(info: ToolProps) {
+ const root = info.input.path ?? ""
+ const title = `Grep "${info.input.pattern}"`
+ const suffix = root ? `in ${normalizePath(root)}` : ""
+ const num = info.metadata.matches
+ const description =
+ num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
+ inline({
+ icon: "✱",
+ title,
+ ...(description && { description }),
+ })
+}
+
+function list(info: ToolProps) {
+ const dir = info.input.path ? normalizePath(info.input.path) : ""
+ inline({
+ icon: "→",
+ title: dir ? `List ${dir}` : "List",
+ })
+}
+
+function read(info: ToolProps) {
+ const file = normalizePath(info.input.filePath)
+ const pairs = Object.entries(info.input).filter(([key, value]) => {
+ if (key === "filePath") return false
+ return typeof value === "string" || typeof value === "number" || typeof value === "boolean"
+ })
+ const description = pairs.length ? `[${pairs.map(([key, value]) => `${key}=${value}`).join(", ")}]` : undefined
+ inline({
+ icon: "→",
+ title: `Read ${file}`,
+ ...(description && { description }),
+ })
+}
+
+function write(info: ToolProps) {
+ block(
+ {
+ icon: "←",
+ title: `Write ${normalizePath(info.input.filePath)}`,
+ },
+ info.part.state.status === "completed" ? info.part.state.output : undefined,
+ )
+}
+
+function webfetch(info: ToolProps) {
+ inline({
+ icon: "%",
+ title: `WebFetch ${info.input.url}`,
+ })
+}
+
+function edit(info: ToolProps) {
+ const title = normalizePath(info.input.filePath)
+ const diff = info.metadata.diff
+ block(
+ {
+ icon: "←",
+ title: `Edit ${title}`,
+ },
+ diff,
+ )
+}
+
+function codesearch(info: ToolProps) {
+ inline({
+ icon: "◇",
+ title: `Exa Code Search "${info.input.query}"`,
+ })
+}
+
+function websearch(info: ToolProps) {
+ inline({
+ icon: "◈",
+ title: `Exa Web Search "${info.input.query}"`,
+ })
+}
+
+function task(info: ToolProps) {
+ const agent = Locale.titlecase(info.input.subagent_type)
+ const desc = info.input.description
+ const started = info.part.state.status === "running"
+ const name = desc ?? `${agent} Task`
+ inline({
+ icon: started ? "•" : "✓",
+ title: name,
+ description: desc ? `${agent} Agent` : undefined,
+ })
+}
+
+function skill(info: ToolProps) {
+ inline({
+ icon: "→",
+ title: `Skill "${info.input.name}"`,
+ })
+}
+
+function bash(info: ToolProps) {
+ const output = info.part.state.status === "completed" ? info.part.state.output?.trim() : undefined
+ block(
+ {
+ icon: "$",
+ title: `${info.input.command}`,
+ },
+ output,
+ )
+}
+
+function todo(info: ToolProps) {
+ block(
+ {
+ icon: "#",
+ title: "Todos",
+ },
+ info.input.todos.map((item) => `${item.status === "completed" ? "[x]" : "[ ]"} ${item.content}`).join("\n"),
+ )
+}
+
+function normalizePath(input?: string) {
+ if (!input) return ""
+ if (path.isAbsolute(input)) return path.relative(process.cwd(), input) || "."
+ return input
}
export const RunCommand = cmd({
@@ -91,17 +277,22 @@ export const RunCommand = cmd({
type: "string",
describe: "model variant (provider-specific reasoning effort, e.g., high, max, minimal)",
})
+ .option("thinking", {
+ type: "boolean",
+ describe: "show thinking blocks",
+ default: false,
+ })
},
handler: async (args) => {
let message = [...args.message, ...(args["--"] || [])]
.map((arg) => (arg.includes(" ") ? `"${arg.replace(/"/g, '\\"')}"` : arg))
.join(" ")
- const fileParts: any[] = []
+ const files: { type: "file"; url: string; filename: string; mime: string }[] = []
if (args.file) {
- const files = Array.isArray(args.file) ? args.file : [args.file]
+ const list = Array.isArray(args.file) ? args.file : [args.file]
- for (const filePath of files) {
+ for (const filePath of list) {
const resolvedPath = path.resolve(process.cwd(), filePath)
const file = Bun.file(resolvedPath)
const stats = await file.stat().catch(() => {})
@@ -117,7 +308,7 @@ export const RunCommand = cmd({
const stat = await file.stat()
const mime = stat.isDirectory() ? "application/x-directory" : "text/plain"
- fileParts.push({
+ files.push({
type: "file",
url: `file://${resolvedPath}`,
filename: path.basename(resolvedPath),
@@ -133,17 +324,75 @@ export const RunCommand = cmd({
process.exit(1)
}
- const execute = async (sdk: OpencodeClient, sessionID: string) => {
- const printEvent = (color: string, type: string, title: string) => {
- UI.println(
- color + `|`,
- UI.Style.TEXT_NORMAL + UI.Style.TEXT_DIM + ` ${type.padEnd(7, " ")}`,
- "",
- UI.Style.TEXT_NORMAL + title,
- )
+ const rules: PermissionNext.Ruleset = [
+ {
+ permission: "question",
+ action: "deny",
+ pattern: "*",
+ },
+ {
+ permission: "plan_enter",
+ action: "deny",
+ pattern: "*",
+ },
+ {
+ permission: "plan_exit",
+ action: "deny",
+ pattern: "*",
+ },
+ ]
+
+ function title() {
+ if (args.title === undefined) return
+ if (args.title !== "") return args.title
+ return message.slice(0, 50) + (message.length > 50 ? "..." : "")
+ }
+
+ async function session(sdk: OpencodeClient) {
+ if (args.continue) {
+ const result = await sdk.session.list()
+ return result.data?.find((s) => !s.parentID)?.id
+ }
+ if (args.session) return args.session
+ const name = title()
+ const result = await sdk.session.create({ title: name, permission: rules })
+ return result.data?.id
+ }
+
+ async function share(sdk: OpencodeClient, sessionID: string) {
+ const cfg = await sdk.config.get()
+ if (!cfg.data) return
+ if (cfg.data.share !== "auto" && !Flag.OPENCODE_AUTO_SHARE && !args.share) return
+ const res = await sdk.session.share({ sessionID }).catch((error) => {
+ if (error instanceof Error && error.message.includes("disabled")) {
+ UI.println(UI.Style.TEXT_DANGER_BOLD + "! " + error.message)
+ }
+ return { error }
+ })
+ if (!res.error && "data" in res && res.data?.share?.url) {
+ UI.println(UI.Style.TEXT_INFO_BOLD + "~ " + res.data.share.url)
+ }
+ }
+
+ async function execute(sdk: OpencodeClient) {
+ function tool(part: ToolPart) {
+ if (part.tool === "bash") return bash(props(part))
+ if (part.tool === "glob") return glob(props(part))
+ if (part.tool === "grep") return grep(props(part))
+ if (part.tool === "list") return list(props(part))
+ if (part.tool === "read") return read(props(part))
+ if (part.tool === "write") return write(props(part))
+ if (part.tool === "webfetch") return webfetch(props(part))
+ if (part.tool === "edit") return edit(props(part))
+ if (part.tool === "codesearch") return codesearch(props(part))
+ if (part.tool === "websearch") return websearch(props(part))
+ if (part.tool === "task") return task(props(part))
+ if (part.tool === "todowrite") return todo(props(part))
+ if (part.tool === "skill") return skill(props(part))
+ return fallback(part)
}
- const outputJsonEvent = (type: string, data: any) => {
+ function emit(type: string, data: Record) {
if (args.format === "json") {
process.stdout.write(JSON.stringify({ type, timestamp: Date.now(), sessionID, ...data }) + EOL)
return true
@@ -152,41 +401,77 @@ export const RunCommand = cmd({
}
const events = await sdk.event.subscribe()
- let errorMsg: string | undefined
+ let error: string | undefined
+
+ async function loop() {
+ const toggles = new Map()
- const eventProcessor = (async () => {
for await (const event of events.stream) {
+ if (
+ event.type === "message.updated" &&
+ event.properties.info.role === "assistant" &&
+ args.format !== "json" &&
+ toggles.get("start") !== true
+ ) {
+ UI.empty()
+ UI.println(`> ${event.properties.info.agent} · ${event.properties.info.modelID}`)
+ UI.empty()
+ toggles.set("start", true)
+ }
+
if (event.type === "message.part.updated") {
const part = event.properties.part
if (part.sessionID !== sessionID) continue
if (part.type === "tool" && part.state.status === "completed") {
- if (outputJsonEvent("tool_use", { part })) continue
- const [tool, color] = TOOL[part.tool] ?? [part.tool, UI.Style.TEXT_INFO_BOLD]
- const title =
- part.state.title ||
- (Object.keys(part.state.input).length > 0 ? JSON.stringify(part.state.input) : "Unknown")
- printEvent(color, tool, title)
- if (part.tool === "bash" && part.state.output?.trim()) {
- UI.println()
- UI.println(part.state.output)
- }
+ if (emit("tool_use", { part })) continue
+ tool(part)
+ }
+
+ if (
+ part.type === "tool" &&
+ part.tool === "task" &&
+ part.state.status === "running" &&
+ args.format !== "json"
+ ) {
+ if (toggles.get(part.id) === true) continue
+ task(props(part))
+ toggles.set(part.id, true)
}
if (part.type === "step-start") {
- if (outputJsonEvent("step_start", { part })) continue
+ if (emit("step_start", { part })) continue
}
if (part.type === "step-finish") {
- if (outputJsonEvent("step_finish", { part })) continue
+ if (emit("step_finish", { part })) continue
}
if (part.type === "text" && part.time?.end) {
- if (outputJsonEvent("text", { part })) continue
- const isPiped = !process.stdout.isTTY
- if (!isPiped) UI.println()
- process.stdout.write((isPiped ? part.text : UI.markdown(part.text)) + EOL)
- if (!isPiped) UI.println()
+ if (emit("text", { part })) continue
+ const text = part.text.trim()
+ if (!text) continue
+ if (!process.stdout.isTTY) {
+ process.stdout.write(text + EOL)
+ continue
+ }
+ UI.empty()
+ UI.println(text)
+ UI.empty()
+ }
+
+ if (part.type === "reasoning" && part.time?.end && args.thinking) {
+ if (emit("reasoning", { part })) continue
+ const text = part.text.trim()
+ if (!text) continue
+ const line = `Thinking: ${text}`
+ if (process.stdout.isTTY) {
+ UI.empty()
+ UI.println(`${UI.Style.TEXT_DIM}\u001b[3m${line}\u001b[0m${UI.Style.TEXT_NORMAL}`)
+ UI.empty()
+ continue
+ }
+ process.stdout.write(line + EOL)
}
}
@@ -197,42 +482,40 @@ export const RunCommand = cmd({
if ("data" in props.error && props.error.data && "message" in props.error.data) {
err = String(props.error.data.message)
}
- errorMsg = errorMsg ? errorMsg + EOL + err : err
- if (outputJsonEvent("error", { error: props.error })) continue
+ error = error ? error + EOL + err : err
+ if (emit("error", { error: props.error })) continue
UI.error(err)
}
- if (event.type === "session.idle" && event.properties.sessionID === sessionID) {
+ if (
+ event.type === "session.status" &&
+ event.properties.sessionID === sessionID &&
+ event.properties.status.type === "idle"
+ ) {
break
}
if (event.type === "permission.asked") {
const permission = event.properties
if (permission.sessionID !== sessionID) continue
- const result = await select({
- message: `Permission required: ${permission.permission} (${permission.patterns.join(", ")})`,
- options: [
- { value: "once", label: "Allow once" },
- { value: "always", label: "Always allow: " + permission.always.join(", ") },
- { value: "reject", label: "Reject" },
- ],
- initialValue: "once",
- }).catch(() => "reject")
- const response = (result.toString().includes("cancel") ? "reject" : result) as "once" | "always" | "reject"
- await sdk.permission.respond({
- sessionID,
- permissionID: permission.id,
- response,
+ UI.println(
+ UI.Style.TEXT_WARNING_BOLD + "!",
+ UI.Style.TEXT_NORMAL +
+ `permission requested: ${permission.permission} (${permission.patterns.join(", ")}); auto-rejecting`,
+ )
+ await sdk.permission.reply({
+ requestID: permission.id,
+ reply: "reject",
})
}
}
- })()
+ }
// Validate agent if specified
- const resolvedAgent = await (async () => {
+ const agent = await (async () => {
if (!args.agent) return undefined
- const agent = await Agent.get(args.agent)
- if (!agent) {
+ const entry = await Agent.get(args.agent)
+ if (!entry) {
UI.println(
UI.Style.TEXT_WARNING_BOLD + "!",
UI.Style.TEXT_NORMAL,
@@ -240,7 +523,7 @@ export const RunCommand = cmd({
)
return undefined
}
- if (agent.mode === "subagent") {
+ if (entry.mode === "subagent") {
UI.println(
UI.Style.TEXT_WARNING_BOLD + "!",
UI.Style.TEXT_NORMAL,
@@ -251,91 +534,42 @@ export const RunCommand = cmd({
return args.agent
})()
+ const sessionID = await session(sdk)
+ if (!sessionID) {
+ UI.error("Session not found")
+ process.exit(1)
+ }
+ await share(sdk, sessionID)
+
+ loop().catch((e) => {
+ console.error(e)
+ process.exit(1)
+ })
+
if (args.command) {
await sdk.session.command({
sessionID,
- agent: resolvedAgent,
+ agent,
model: args.model,
command: args.command,
arguments: message,
variant: args.variant,
})
} else {
- const modelParam = args.model ? Provider.parseModel(args.model) : undefined
+ const model = args.model ? Provider.parseModel(args.model) : undefined
await sdk.session.prompt({
sessionID,
- agent: resolvedAgent,
- model: modelParam,
+ agent,
+ model,
variant: args.variant,
- parts: [...fileParts, { type: "text", text: message }],
+ parts: [...files, { type: "text", text: message }],
})
}
-
- await eventProcessor
- if (errorMsg) process.exit(1)
}
if (args.attach) {
const sdk = createOpencodeClient({ baseUrl: args.attach })
-
- const sessionID = await (async () => {
- if (args.continue) {
- const result = await sdk.session.list()
- return result.data?.find((s) => !s.parentID)?.id
- }
- if (args.session) return args.session
-
- const title =
- args.title !== undefined
- ? args.title === ""
- ? message.slice(0, 50) + (message.length > 50 ? "..." : "")
- : args.title
- : undefined
-
- const result = await sdk.session.create(
- title
- ? {
- title,
- permission: [
- {
- permission: "question",
- action: "deny",
- pattern: "*",
- },
- ],
- }
- : {
- permission: [
- {
- permission: "question",
- action: "deny",
- pattern: "*",
- },
- ],
- },
- )
- return result.data?.id
- })()
-
- if (!sessionID) {
- UI.error("Session not found")
- process.exit(1)
- }
-
- const cfgResult = await sdk.config.get()
- if (cfgResult.data && (cfgResult.data.share === "auto" || Flag.OPENCODE_AUTO_SHARE || args.share)) {
- const shareResult = await sdk.session.share({ sessionID }).catch((error) => {
- if (error instanceof Error && error.message.includes("disabled")) {
- UI.println(UI.Style.TEXT_DANGER_BOLD + "! " + error.message)
- }
- return { error }
- })
- if (!shareResult.error && "data" in shareResult && shareResult.data?.share?.url) {
- UI.println(UI.Style.TEXT_INFO_BOLD + "~ " + shareResult.data.share.url)
- }
- }
-
- return await execute(sdk, sessionID)
+ return await execute(sdk)
}
await bootstrap(process.cwd(), async () => {
@@ -344,52 +578,7 @@ export const RunCommand = cmd({
return Server.App().fetch(request)
}) as typeof globalThis.fetch
const sdk = createOpencodeClient({ baseUrl: "http://opencode.internal", fetch: fetchFn })
-
- if (args.command) {
- const exists = await Command.get(args.command)
- if (!exists) {
- UI.error(`Command "${args.command}" not found`)
- process.exit(1)
- }
- }
-
- const sessionID = await (async () => {
- if (args.continue) {
- const result = await sdk.session.list()
- return result.data?.find((s) => !s.parentID)?.id
- }
- if (args.session) return args.session
-
- const title =
- args.title !== undefined
- ? args.title === ""
- ? message.slice(0, 50) + (message.length > 50 ? "..." : "")
- : args.title
- : undefined
-
- const result = await sdk.session.create(title ? { title } : {})
- return result.data?.id
- })()
-
- if (!sessionID) {
- UI.error("Session not found")
- process.exit(1)
- }
-
- const cfgResult = await sdk.config.get()
- if (cfgResult.data && (cfgResult.data.share === "auto" || Flag.OPENCODE_AUTO_SHARE || args.share)) {
- const shareResult = await sdk.session.share({ sessionID }).catch((error) => {
- if (error instanceof Error && error.message.includes("disabled")) {
- UI.println(UI.Style.TEXT_DANGER_BOLD + "! " + error.message)
- }
- return { error }
- })
- if (!shareResult.error && "data" in shareResult && shareResult.data?.share?.url) {
- UI.println(UI.Style.TEXT_INFO_BOLD + "~ " + shareResult.data.share.url)
- }
- }
-
- await execute(sdk, sessionID)
+ await execute(sdk)
})
},
})
diff --git a/packages/opencode/src/cli/cmd/tui/context/local.tsx b/packages/opencode/src/cli/cmd/tui/context/local.tsx
index d058ce54fb..72c72dc5bb 100644
--- a/packages/opencode/src/cli/cmd/tui/context/local.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/local.tsx
@@ -35,6 +35,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
const agent = iife(() => {
const agents = createMemo(() => sync.data.agent.filter((x) => x.mode !== "subagent" && !x.hidden))
+ const visibleAgents = createMemo(() => sync.data.agent.filter((x) => !x.hidden))
const [agentStore, setAgentStore] = createStore<{
current: string
}>({
@@ -48,6 +49,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
theme.warning,
theme.primary,
theme.error,
+ theme.info,
])
return {
list() {
@@ -75,11 +77,16 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
})
},
color(name: string) {
- const all = sync.data.agent
- const agent = all.find((x) => x.name === name)
- if (agent?.color) return RGBA.fromHex(agent.color)
- const index = all.findIndex((x) => x.name === name)
+ const index = visibleAgents().findIndex((x) => x.name === name)
if (index === -1) return colors()[0]
+ const agent = visibleAgents()[index]
+
+ if (agent?.color) {
+ const color = agent.color
+ if (color.startsWith("#")) return RGBA.fromHex(color)
+ // already validated by config, just satisfying TS here
+ return theme[color as keyof typeof theme] as RGBA
+ }
return colors()[index % colors().length]
},
}
diff --git a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
index 5c27a26cd0..ad1f86e307 100644
--- a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
+++ b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
@@ -148,8 +148,9 @@ export namespace Clipboard {
export async function copy(text: string): Promise {
const renderer = rendererRef.current
if (renderer) {
- const copied = renderer.copyToClipboardOSC52(text)
- if (copied) return
+ // Try OSC52 but don't early return - always fall back to native method
+ // OSC52 may report success but not actually work in all terminals
+ renderer.copyToClipboardOSC52(text)
}
await getCopyMethod()(text)
}
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 54ca94ae4d..91816a00fc 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -28,6 +28,7 @@ import { existsSync } from "fs"
import { Bus } from "@/bus"
import { GlobalBus } from "@/bus/global"
import { Event } from "../server/event"
+import { PackageRegistry } from "@/bun/registry"
export namespace Config {
const log = Log.create({ service: "config" })
@@ -154,9 +155,10 @@ export namespace Config {
}
}
- const exists = existsSync(path.join(dir, "node_modules"))
- const installing = installDependencies(dir)
- if (!exists) await installing
+ const shouldInstall = await needsInstall(dir)
+ if (shouldInstall) {
+ await installDependencies(dir)
+ }
result.command = mergeDeep(result.command ?? {}, await loadCommand(dir))
result.agent = mergeDeep(result.agent, await loadAgent(dir))
@@ -235,6 +237,7 @@ export namespace Config {
export async function installDependencies(dir: string) {
const pkg = path.join(dir, "package.json")
+ const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION
if (!(await Bun.file(pkg).exists())) {
await Bun.write(pkg, "{}")
@@ -244,18 +247,43 @@ export namespace Config {
const hasGitIgnore = await Bun.file(gitignore).exists()
if (!hasGitIgnore) await Bun.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
- await BunProc.run(
- ["add", "@opencode-ai/plugin@" + (Installation.isLocal() ? "latest" : Installation.VERSION), "--exact"],
- {
- cwd: dir,
- },
- ).catch(() => {})
+ await BunProc.run(["add", `@opencode-ai/plugin@${targetVersion}`, "--exact"], {
+ cwd: dir,
+ }).catch(() => {})
// Install any additional dependencies defined in the package.json
// This allows local plugins and custom tools to use external packages
await BunProc.run(["install"], { cwd: dir }).catch(() => {})
}
+ async function needsInstall(dir: string) {
+ const nodeModules = path.join(dir, "node_modules")
+ if (!existsSync(nodeModules)) return true
+
+ const pkg = path.join(dir, "package.json")
+ const pkgFile = Bun.file(pkg)
+ const pkgExists = await pkgFile.exists()
+ if (!pkgExists) return true
+
+ const parsed = await pkgFile.json().catch(() => null)
+ const dependencies = parsed?.dependencies ?? {}
+ const depVersion = dependencies["@opencode-ai/plugin"]
+ if (!depVersion) return true
+
+ const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION
+ if (targetVersion === "latest") {
+ const isOutdated = await PackageRegistry.isOutdated("@opencode-ai/plugin", depVersion, dir)
+ if (!isOutdated) return false
+ log.info("Cached version is outdated, proceeding with install", {
+ pkg: "@opencode-ai/plugin",
+ cachedVersion: depVersion,
+ })
+ return true
+ }
+ if (depVersion === targetVersion) return false
+ return true
+ }
+
function rel(item: string, patterns: string[]) {
for (const pattern of patterns) {
const index = item.indexOf(pattern)
@@ -617,10 +645,12 @@ export namespace Config {
.describe("Hide this subagent from the @ autocomplete menu (default: false, only applies to mode: subagent)"),
options: z.record(z.string(), z.any()).optional(),
color: z
- .string()
- .regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color format")
+ .union([
+ z.string().regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color format"),
+ z.enum(["primary", "secondary", "accent", "success", "warning", "error", "info"]),
+ ])
.optional()
- .describe("Hex color code for the agent (e.g., #FF5733)"),
+ .describe("Hex color code (e.g., #FF5733) or theme color (e.g., primary)"),
steps: z
.number()
.int()
diff --git a/packages/opencode/src/flag/flag.ts b/packages/opencode/src/flag/flag.ts
index 64ae801d18..b11058b340 100644
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -23,6 +23,8 @@ export namespace Flag {
OPENCODE_DISABLE_CLAUDE_CODE || truthy("OPENCODE_DISABLE_CLAUDE_CODE_PROMPT")
export const OPENCODE_DISABLE_CLAUDE_CODE_SKILLS =
OPENCODE_DISABLE_CLAUDE_CODE || truthy("OPENCODE_DISABLE_CLAUDE_CODE_SKILLS")
+ export const OPENCODE_DISABLE_EXTERNAL_SKILLS =
+ OPENCODE_DISABLE_CLAUDE_CODE_SKILLS || truthy("OPENCODE_DISABLE_EXTERNAL_SKILLS")
export declare const OPENCODE_DISABLE_PROJECT_CONFIG: boolean
export const OPENCODE_FAKE_VCS = process.env["OPENCODE_FAKE_VCS"]
export declare const OPENCODE_CLIENT: string
diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts
index e7efd99dcb..b0755b8b56 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -732,7 +732,7 @@ export namespace LSPServer {
export const CSharp: Info = {
id: "csharp",
- root: NearestRoot([".sln", ".csproj", "global.json"]),
+ root: NearestRoot([".slnx", ".sln", ".csproj", "global.json"]),
extensions: [".cs"],
async spawn(root) {
let bin = Bun.which("csharp-ls", {
@@ -772,7 +772,7 @@ export namespace LSPServer {
export const FSharp: Info = {
id: "fsharp",
- root: NearestRoot([".sln", ".fsproj", "global.json"]),
+ root: NearestRoot([".slnx", ".sln", ".fsproj", "global.json"]),
extensions: [".fs", ".fsi", ".fsx", ".fsscript"],
async spawn(root) {
let bin = Bun.which("fsautocomplete", {
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
index 27a86a2fcc..fc90571fef 100644
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -461,52 +461,36 @@ export namespace Provider {
if (!accountId || !gateway) return { autoload: false }
- // Get API token from env or auth prompt
+ // Get API token from env or auth - required for authenticated gateways
const apiToken = await (async () => {
- const envToken = Env.get("CLOUDFLARE_API_TOKEN")
+ const envToken = Env.get("CLOUDFLARE_API_TOKEN") || Env.get("CF_AIG_TOKEN")
if (envToken) return envToken
const auth = await Auth.get(input.id)
if (auth?.type === "api") return auth.key
return undefined
})()
+ if (!apiToken) {
+ throw new Error(
+ "CLOUDFLARE_API_TOKEN (or CF_AIG_TOKEN) is required for Cloudflare AI Gateway. " +
+ "Set it via environment variable or run `opencode auth cloudflare-ai-gateway`.",
+ )
+ }
+
+ // Use official ai-gateway-provider package (v2.x for AI SDK v5 compatibility)
+ const { createAiGateway } = await import("ai-gateway-provider")
+ const { createUnified } = await import("ai-gateway-provider/providers/unified")
+
+ const aigateway = createAiGateway({ accountId, gateway, apiKey: apiToken })
+ const unified = createUnified()
+
return {
autoload: true,
- async getModel(sdk: any, modelID: string, _options?: Record) {
- return sdk.languageModel(modelID)
- },
- options: {
- baseURL: `https://gateway.ai.cloudflare.com/v1/${accountId}/${gateway}/compat`,
- headers: {
- // Cloudflare AI Gateway uses cf-aig-authorization for authenticated gateways
- // This enables Unified Billing where Cloudflare handles upstream provider auth
- ...(apiToken ? { "cf-aig-authorization": `Bearer ${apiToken}` } : {}),
- "HTTP-Referer": "https://opencode.ai/",
- "X-Title": "opencode",
- },
- // Custom fetch to handle parameter transformation and auth
- fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
- const headers = new Headers(init?.headers)
- // Strip Authorization header - AI Gateway uses cf-aig-authorization instead
- headers.delete("Authorization")
-
- // Transform max_tokens to max_completion_tokens for newer models
- if (init?.body && init.method === "POST") {
- try {
- const body = JSON.parse(init.body as string)
- if (body.max_tokens !== undefined && !body.max_completion_tokens) {
- body.max_completion_tokens = body.max_tokens
- delete body.max_tokens
- init = { ...init, body: JSON.stringify(body) }
- }
- } catch (e) {
- // If body parsing fails, continue with original request
- }
- }
-
- return fetch(input, { ...init, headers })
- },
+ async getModel(_sdk: any, modelID: string, _options?: Record) {
+ // Model IDs use Unified API format: provider/model (e.g., "anthropic/claude-sonnet-4-5")
+ return aigateway(unified(modelID))
},
+ options: {},
}
},
cerebras: async () => {
@@ -1001,6 +985,12 @@ export namespace Provider {
const fetchFn = customFetch ?? fetch
const opts = init ?? {}
+ // Merge configured headers into request headers
+ opts.headers = {
+ ...(typeof opts.headers === "object" ? opts.headers : {}),
+ ...options["headers"],
+ }
+
if (options["timeout"] !== undefined && options["timeout"] !== null) {
const signals: AbortSignal[] = []
if (opts.signal) signals.push(opts.signal)
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index c05bf75c46..6833cd0c0c 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -1,5 +1,6 @@
import type { APICallError, ModelMessage } from "ai"
import { mergeDeep, unique } from "remeda"
+import type { JSONSchema7 } from "@ai-sdk/provider"
import type { JSONSchema } from "zod/v4/core"
import type { Provider } from "./provider"
import type { ModelsDev } from "./models"
@@ -333,7 +334,9 @@ export namespace ProviderTransform {
id.includes("minimax") ||
id.includes("glm") ||
id.includes("mistral") ||
- id.includes("kimi")
+ id.includes("kimi") ||
+ // TODO: Remove this after models.dev data is fixed to use "kimi-k2.5" instead of "k2p5"
+ id.includes("k2p5")
)
return {}
@@ -717,7 +720,7 @@ export namespace ProviderTransform {
return standardLimit
}
- export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema) {
+ export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema | JSONSchema7): JSONSchema7 {
/*
if (["openai", "azure"].includes(providerID)) {
if (schema.type === "object" && schema.properties) {
@@ -768,8 +771,21 @@ export namespace ProviderTransform {
result.required = result.required.filter((field: any) => field in result.properties)
}
- if (result.type === "array" && result.items == null) {
- result.items = {}
+ if (result.type === "array") {
+ if (result.items == null) {
+ result.items = {}
+ }
+ // Ensure items has at least a type if it's an empty object
+ // This handles nested arrays like { type: "array", items: { type: "array", items: {} } }
+ if (typeof result.items === "object" && !Array.isArray(result.items) && !result.items.type) {
+ result.items.type = "string"
+ }
+ }
+
+ // Remove properties/required from non-object types (Gemini rejects these)
+ if (result.type && result.type !== "object") {
+ delete result.properties
+ delete result.required
}
return result
@@ -778,7 +794,7 @@ export namespace ProviderTransform {
schema = sanitizeGemini(schema)
}
- return schema
+ return schema as JSONSchema7
}
export function error(providerID: string, error: APICallError) {
diff --git a/packages/opencode/src/pty/index.ts b/packages/opencode/src/pty/index.ts
index d01b2b02e9..a27ee9a744 100644
--- a/packages/opencode/src/pty/index.ts
+++ b/packages/opencode/src/pty/index.ts
@@ -8,6 +8,7 @@ import type { WSContext } from "hono/ws"
import { Instance } from "../project/instance"
import { lazy } from "@opencode-ai/util/lazy"
import { Shell } from "@/shell/shell"
+import { Plugin } from "@/plugin"
export namespace Pty {
const log = Log.create({ service: "pty" })
@@ -102,9 +103,11 @@ export namespace Pty {
}
const cwd = input.cwd || Instance.directory
+ const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
const env = {
...process.env,
...input.env,
+ ...shellEnv.env,
TERM: "xterm-256color",
OPENCODE_TERMINAL: "1",
} as Record
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index e0861c4df5..ab1eba5beb 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -9,7 +9,7 @@ import { SessionRevert } from "./revert"
import { Session } from "."
import { Agent } from "../agent/agent"
import { Provider } from "../provider/provider"
-import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions } from "ai"
+import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions, asSchema } from "ai"
import { SessionCompaction } from "./compaction"
import { Instance } from "../project/instance"
import { Bus } from "../bus"
@@ -738,6 +738,8 @@ export namespace SessionPrompt {
const execute = item.execute
if (!execute) continue
+ const transformed = ProviderTransform.schema(input.model, asSchema(item.inputSchema).jsonSchema)
+ item.inputSchema = jsonSchema(transformed)
// Wrap execute to add plugin hooks and format output
item.execute = async (args, opts) => {
const ctx = context(args, opts)
@@ -1498,12 +1500,15 @@ NOTE: At any point in time through this workflow you should feel free to ask the
const matchingInvocation = invocations[shellName] ?? invocations[""]
const args = matchingInvocation?.args
+ const cwd = Instance.directory
+ const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
const proc = spawn(shell, args, {
- cwd: Instance.directory,
+ cwd,
detached: process.platform !== "win32",
stdio: ["ignore", "pipe", "pipe"],
env: {
...process.env,
+ ...shellEnv.env,
TERM: "dumb",
},
})
diff --git a/packages/opencode/src/skill/skill.ts b/packages/opencode/src/skill/skill.ts
index 6e05d013ae..b4f4acd527 100644
--- a/packages/opencode/src/skill/skill.ts
+++ b/packages/opencode/src/skill/skill.ts
@@ -40,12 +40,17 @@ export namespace Skill {
}),
)
+ // External skill directories to search for (project-level and global)
+ // These follow the directory layout used by Claude Code and other agents.
+ const EXTERNAL_DIRS = [".claude", ".agents"]
+ const EXTERNAL_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
+
const OPENCODE_SKILL_GLOB = new Bun.Glob("{skill,skills}/**/SKILL.md")
- const CLAUDE_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
const SKILL_GLOB = new Bun.Glob("**/SKILL.md")
export const state = Instance.state(async () => {
const skills: Record = {}
+ const dirs = new Set()
const addSkill = async (match: string) => {
const md = await ConfigMarkdown.parse(match).catch((err) => {
@@ -71,6 +76,8 @@ export namespace Skill {
})
}
+ dirs.add(path.dirname(match))
+
skills[parsed.data.name] = {
name: parsed.data.name,
description: parsed.data.description,
@@ -79,38 +86,37 @@ export namespace Skill {
}
}
- // Scan .claude/skills/ directories (project-level)
- const claudeDirs = await Array.fromAsync(
- Filesystem.up({
- targets: [".claude"],
- start: Instance.directory,
- stop: Instance.worktree,
- }),
- )
- // Also include global ~/.claude/skills/
- const globalClaude = `${Global.Path.home}/.claude`
- if (await Filesystem.isDir(globalClaude)) {
- claudeDirs.push(globalClaude)
+ const scanExternal = async (root: string, scope: "global" | "project") => {
+ return Array.fromAsync(
+ EXTERNAL_SKILL_GLOB.scan({
+ cwd: root,
+ absolute: true,
+ onlyFiles: true,
+ followSymlinks: true,
+ dot: true,
+ }),
+ )
+ .then((matches) => Promise.all(matches.map(addSkill)))
+ .catch((error) => {
+ log.error(`failed to scan ${scope} skills`, { dir: root, error })
+ })
}
- if (!Flag.OPENCODE_DISABLE_CLAUDE_CODE_SKILLS) {
- for (const dir of claudeDirs) {
- const matches = await Array.fromAsync(
- CLAUDE_SKILL_GLOB.scan({
- cwd: dir,
- absolute: true,
- onlyFiles: true,
- followSymlinks: true,
- dot: true,
- }),
- ).catch((error) => {
- log.error("failed .claude directory scan for skills", { dir, error })
- return []
- })
+ // Scan external skill directories (.claude/skills/, .agents/skills/, etc.)
+ // Load global (home) first, then project-level (so project-level overwrites)
+ if (!Flag.OPENCODE_DISABLE_EXTERNAL_SKILLS) {
+ for (const dir of EXTERNAL_DIRS) {
+ const root = path.join(Global.Path.home, dir)
+ if (!(await Filesystem.isDir(root))) continue
+ await scanExternal(root, "global")
+ }
- for (const match of matches) {
- await addSkill(match)
- }
+ for await (const root of Filesystem.up({
+ targets: EXTERNAL_DIRS,
+ start: Instance.directory,
+ stop: Instance.worktree,
+ })) {
+ await scanExternal(root, "project")
}
}
@@ -145,14 +151,21 @@ export namespace Skill {
}
}
- return skills
+ return {
+ skills,
+ dirs: Array.from(dirs),
+ }
})
export async function get(name: string) {
- return state().then((x) => x[name])
+ return state().then((x) => x.skills[name])
}
export async function all() {
- return state().then((x) => Object.values(x))
+ return state().then((x) => Object.values(x.skills))
+ }
+
+ export async function dirs() {
+ return state().then((x) => x.dirs)
}
}
diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index ff208ff3fa..67559b78c0 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -16,6 +16,7 @@ import { Shell } from "@/shell/shell"
import { BashArity } from "@/permission/arity"
import { Truncate } from "./truncation"
+import { Plugin } from "@/plugin"
const MAX_METADATA_LENGTH = 30_000
const DEFAULT_TIMEOUT = Flag.OPENCODE_EXPERIMENTAL_BASH_DEFAULT_TIMEOUT_MS || 2 * 60 * 1000
@@ -162,11 +163,13 @@ export const BashTool = Tool.define("bash", async () => {
})
}
+ const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
const proc = spawn(params.command, {
shell,
cwd,
env: {
...process.env,
+ ...shellEnv.env,
},
stdio: ["ignore", "pipe", "pipe"],
detached: process.platform !== "win32",
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 7b3a458897..3cb7715947 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -110,7 +110,7 @@ export namespace ToolRegistry {
TaskTool,
WebFetchTool,
TodoWriteTool,
- TodoReadTool,
+ // TodoReadTool,
WebSearchTool,
CodeSearchTool,
SkillTool,
diff --git a/packages/opencode/src/tool/skill.ts b/packages/opencode/src/tool/skill.ts
index 8f285d5999..8fcfb592de 100644
--- a/packages/opencode/src/tool/skill.ts
+++ b/packages/opencode/src/tool/skill.ts
@@ -1,8 +1,11 @@
import path from "path"
+import { pathToFileURL } from "url"
import z from "zod"
import { Tool } from "./tool"
import { Skill } from "../skill"
import { PermissionNext } from "../permission/next"
+import { Ripgrep } from "../file/ripgrep"
+import { iife } from "@/util/iife"
export const SkillTool = Tool.define("skill", async (ctx) => {
const skills = await Skill.all()
@@ -18,21 +21,29 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
const description =
accessibleSkills.length === 0
- ? "Load a skill to get detailed instructions for a specific task. No skills are currently available."
+ ? "Load a specialized skill that provides domain-specific instructions and workflows. No skills are currently available."
: [
- "Load a skill to get detailed instructions for a specific task.",
- "Skills provide specialized knowledge and step-by-step guidance.",
- "Use this when a task matches an available skill's description.",
- "Only the skills listed here are available:",
+ "Load a specialized skill that provides domain-specific instructions and workflows.",
+ "",
+ "When you recognize that a task matches one of the available skills listed below, use this tool to load the full skill instructions.",
+ "",
+ "The skill will inject detailed instructions, workflows, and access to bundled resources (scripts, references, templates) into the conversation context.",
+ "",
+ 'Tool output includes a `` block with the loaded content.',
+ "",
+ "The following skills provide specialized sets of instructions for particular tasks",
+ "Invoke this tool to load a skill when a task matches one of the available skills listed below:",
+ "",
"",
...accessibleSkills.flatMap((skill) => [
` `,
` ${skill.name}`,
` ${skill.description}`,
+ ` ${pathToFileURL(skill.location).href}`,
` `,
]),
"",
- ].join(" ")
+ ].join("\n")
const examples = accessibleSkills
.map((skill) => `'${skill.name}'`)
@@ -41,7 +52,7 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
const hint = examples.length > 0 ? ` (e.g., ${examples}, ...)` : ""
const parameters = z.object({
- name: z.string().describe(`The skill identifier from available_skills${hint}`),
+ name: z.string().describe(`The name of the skill from available_skills${hint}`),
})
return {
@@ -61,15 +72,47 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
always: [params.name],
metadata: {},
})
- const content = skill.content
- const dir = path.dirname(skill.location)
- // Format output similar to plugin pattern
- const output = [`## Skill: ${skill.name}`, "", `**Base directory**: ${dir}`, "", content.trim()].join("\n")
+ const dir = path.dirname(skill.location)
+ const base = pathToFileURL(dir).href
+
+ const limit = 10
+ const files = await iife(async () => {
+ const arr = []
+ for await (const file of Ripgrep.files({
+ cwd: dir,
+ follow: false,
+ hidden: true,
+ signal: ctx.abort,
+ })) {
+ if (file.includes("SKILL.md")) {
+ continue
+ }
+ arr.push(path.resolve(dir, file))
+ if (arr.length >= limit) {
+ break
+ }
+ }
+ return arr
+ }).then((f) => f.map((file) => `${file}`).join("\n"))
return {
title: `Loaded skill: ${skill.name}`,
- output,
+ output: [
+ ``,
+ `# Skill: ${skill.name}`,
+ "",
+ skill.content.trim(),
+ "",
+ `Base directory for this skill: ${base}`,
+ "Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
+ "Note: file list is sampled.",
+ "",
+ "",
+ files,
+ "",
+ "",
+ ].join("\n"),
metadata: {
name: skill.name,
dir,
diff --git a/packages/opencode/test/agent/agent.test.ts b/packages/opencode/test/agent/agent.test.ts
index 05b8427394..5e91059ffb 100644
--- a/packages/opencode/test/agent/agent.test.ts
+++ b/packages/opencode/test/agent/agent.test.ts
@@ -1,4 +1,5 @@
import { test, expect } from "bun:test"
+import path from "path"
import { tmpdir } from "../fixture/fixture"
import { Instance } from "../../src/project/instance"
import { Agent } from "../../src/agent/agent"
@@ -513,6 +514,42 @@ test("explicit Truncate.GLOB deny is respected", async () => {
})
})
+test("skill directories are allowed for external_directory", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const skillDir = path.join(dir, ".opencode", "skill", "perm-skill")
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: perm-skill
+description: Permission skill.
+---
+
+# Permission Skill
+`,
+ )
+ },
+ })
+
+ const home = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const build = await Agent.get("build")
+ const skillDir = path.join(tmp.path, ".opencode", "skill", "perm-skill")
+ const target = path.join(skillDir, "reference", "notes.md")
+ expect(PermissionNext.evaluate("external_directory", target, build!.permission).action).toBe("allow")
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = home
+ }
+})
+
test("defaultAgent returns build when no default_agent config", async () => {
await using tmp = await tmpdir()
await Instance.provide({
diff --git a/packages/opencode/test/config/agent-color.test.ts b/packages/opencode/test/config/agent-color.test.ts
index a2c3742967..b9c7cccc48 100644
--- a/packages/opencode/test/config/agent-color.test.ts
+++ b/packages/opencode/test/config/agent-color.test.ts
@@ -15,6 +15,7 @@ test("agent color parsed from project config", async () => {
$schema: "https://opencode.ai/config.json",
agent: {
build: { color: "#FFA500" },
+ plan: { color: "primary" },
},
}),
)
@@ -25,6 +26,7 @@ test("agent color parsed from project config", async () => {
fn: async () => {
const cfg = await Config.get()
expect(cfg.agent?.["build"]?.color).toBe("#FFA500")
+ expect(cfg.agent?.["plan"]?.color).toBe("primary")
},
})
})
@@ -38,6 +40,7 @@ test("Agent.get includes color from config", async () => {
$schema: "https://opencode.ai/config.json",
agent: {
plan: { color: "#A855F7" },
+ build: { color: "accent" },
},
}),
)
@@ -48,6 +51,8 @@ test("Agent.get includes color from config", async () => {
fn: async () => {
const plan = await AgentSvc.get("plan")
expect(plan?.color).toBe("#A855F7")
+ const build = await AgentSvc.get("build")
+ expect(build?.color).toBe("accent")
},
})
})
diff --git a/packages/opencode/test/mcp/oauth-browser.test.ts b/packages/opencode/test/mcp/oauth-browser.test.ts
index 598a0315ef..ee4429be75 100644
--- a/packages/opencode/test/mcp/oauth-browser.test.ts
+++ b/packages/opencode/test/mcp/oauth-browser.test.ts
@@ -8,6 +8,7 @@ let openCalledWith: string | undefined
mock.module("open", () => ({
default: async (url: string) => {
openCalledWith = url
+
// Return a mock subprocess that emits an error if openShouldFail is true
const subprocess = new EventEmitter()
if (openShouldFail) {
@@ -133,20 +134,17 @@ test("BrowserOpenFailed event is published when open() throws", async () => {
})
// Run authenticate with a timeout to avoid waiting forever for the callback
- const authPromise = MCP.authenticate("test-oauth-server")
+ // Attach a handler immediately so callback shutdown rejections
+ // don't show up as unhandled between tests.
+ const authPromise = MCP.authenticate("test-oauth-server").catch(() => undefined)
- // Wait for the browser open attempt (error fires at 10ms, but we wait for event to be published)
- await new Promise((resolve) => setTimeout(resolve, 200))
+ // Config.get() can be slow in tests, so give it plenty of time.
+ await new Promise((resolve) => setTimeout(resolve, 2_000))
// Stop the callback server and cancel any pending auth
await McpOAuthCallback.stop()
- // Wait for authenticate to reject (due to server stopping)
- try {
- await authPromise
- } catch {
- // Expected to fail
- }
+ await authPromise
unsubscribe()
@@ -187,20 +185,15 @@ test("BrowserOpenFailed event is NOT published when open() succeeds", async () =
})
// Run authenticate with a timeout to avoid waiting forever for the callback
- const authPromise = MCP.authenticate("test-oauth-server-2")
+ const authPromise = MCP.authenticate("test-oauth-server-2").catch(() => undefined)
- // Wait for the browser open attempt and the 500ms error detection timeout
- await new Promise((resolve) => setTimeout(resolve, 700))
+ // Config.get() can be slow in tests; also covers the ~500ms open() error-detection window.
+ await new Promise((resolve) => setTimeout(resolve, 2_000))
// Stop the callback server and cancel any pending auth
await McpOAuthCallback.stop()
- // Wait for authenticate to reject (due to server stopping)
- try {
- await authPromise
- } catch {
- // Expected to fail
- }
+ await authPromise
unsubscribe()
@@ -237,20 +230,15 @@ test("open() is called with the authorization URL", async () => {
openCalledWith = undefined
// Run authenticate with a timeout to avoid waiting forever for the callback
- const authPromise = MCP.authenticate("test-oauth-server-3")
+ const authPromise = MCP.authenticate("test-oauth-server-3").catch(() => undefined)
- // Wait for the browser open attempt and the 500ms error detection timeout
- await new Promise((resolve) => setTimeout(resolve, 700))
+ // Config.get() can be slow in tests; also covers the ~500ms open() error-detection window.
+ await new Promise((resolve) => setTimeout(resolve, 2_000))
// Stop the callback server and cancel any pending auth
await McpOAuthCallback.stop()
- // Wait for authenticate to reject (due to server stopping)
- try {
- await authPromise
- } catch {
- // Expected to fail
- }
+ await authPromise
// Verify open was called with a URL
expect(openCalledWith).toBeDefined()
diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts
index 8e28f1209e..0e0bb440aa 100644
--- a/packages/opencode/test/provider/transform.test.ts
+++ b/packages/opencode/test/provider/transform.test.ts
@@ -293,6 +293,229 @@ describe("ProviderTransform.schema - gemini array items", () => {
})
})
+describe("ProviderTransform.schema - gemini nested array items", () => {
+ const geminiModel = {
+ providerID: "google",
+ api: {
+ id: "gemini-3-pro",
+ },
+ } as any
+
+ test("adds type to 2D array with empty inner items", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ values: {
+ type: "array",
+ items: {
+ type: "array",
+ items: {}, // Empty items object
+ },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ // Inner items should have a default type
+ expect(result.properties.values.items.items.type).toBe("string")
+ })
+
+ test("adds items and type to 2D array with missing inner items", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ type: "array",
+ items: { type: "array" }, // No items at all
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.data.items.items).toBeDefined()
+ expect(result.properties.data.items.items.type).toBe("string")
+ })
+
+ test("handles deeply nested arrays (3D)", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ matrix: {
+ type: "array",
+ items: {
+ type: "array",
+ items: {
+ type: "array",
+ // No items
+ },
+ },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.matrix.items.items.items).toBeDefined()
+ expect(result.properties.matrix.items.items.items.type).toBe("string")
+ })
+
+ test("preserves existing item types in nested arrays", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ numbers: {
+ type: "array",
+ items: {
+ type: "array",
+ items: { type: "number" }, // Has explicit type
+ },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ // Should preserve the explicit type
+ expect(result.properties.numbers.items.items.type).toBe("number")
+ })
+
+ test("handles mixed nested structures with objects and arrays", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ spreadsheetData: {
+ type: "object",
+ properties: {
+ rows: {
+ type: "array",
+ items: {
+ type: "array",
+ items: {}, // Empty items
+ },
+ },
+ },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.spreadsheetData.properties.rows.items.items.type).toBe("string")
+ })
+})
+
+describe("ProviderTransform.schema - gemini non-object properties removal", () => {
+ const geminiModel = {
+ providerID: "google",
+ api: {
+ id: "gemini-3-pro",
+ },
+ } as any
+
+ test("removes properties from non-object types", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ type: "string",
+ properties: { invalid: { type: "string" } },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.data.type).toBe("string")
+ expect(result.properties.data.properties).toBeUndefined()
+ })
+
+ test("removes required from non-object types", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ type: "array",
+ items: { type: "string" },
+ required: ["invalid"],
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.data.type).toBe("array")
+ expect(result.properties.data.required).toBeUndefined()
+ })
+
+ test("removes properties and required from nested non-object types", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ outer: {
+ type: "object",
+ properties: {
+ inner: {
+ type: "number",
+ properties: { bad: { type: "string" } },
+ required: ["bad"],
+ },
+ },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.outer.properties.inner.type).toBe("number")
+ expect(result.properties.outer.properties.inner.properties).toBeUndefined()
+ expect(result.properties.outer.properties.inner.required).toBeUndefined()
+ })
+
+ test("keeps properties and required on object types", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ type: "object",
+ properties: { name: { type: "string" } },
+ required: ["name"],
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(geminiModel, schema) as any
+
+ expect(result.properties.data.type).toBe("object")
+ expect(result.properties.data.properties).toBeDefined()
+ expect(result.properties.data.required).toEqual(["name"])
+ })
+
+ test("does not affect non-gemini providers", () => {
+ const openaiModel = {
+ providerID: "openai",
+ api: {
+ id: "gpt-4",
+ },
+ } as any
+
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ type: "string",
+ properties: { invalid: { type: "string" } },
+ },
+ },
+ } as any
+
+ const result = ProviderTransform.schema(openaiModel, schema) as any
+
+ expect(result.properties.data.properties).toBeDefined()
+ })
+})
+
describe("ProviderTransform.message - DeepSeek reasoning content", () => {
test("DeepSeek with tool calls includes reasoning_content in providerOptions", () => {
const msgs = [
diff --git a/packages/opencode/test/skill/skill.test.ts b/packages/opencode/test/skill/skill.test.ts
index 72415c1411..c310256c5e 100644
--- a/packages/opencode/test/skill/skill.test.ts
+++ b/packages/opencode/test/skill/skill.test.ts
@@ -55,6 +55,42 @@ Instructions here.
})
})
+test("returns skill directories from Skill.dirs", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const skillDir = path.join(dir, ".opencode", "skill", "dir-skill")
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: dir-skill
+description: Skill for dirs test.
+---
+
+# Dir Skill
+`,
+ )
+ },
+ })
+
+ const home = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const dirs = await Skill.dirs()
+ const skillDir = path.join(tmp.path, ".opencode", "skill", "dir-skill")
+ expect(dirs).toContain(skillDir)
+ expect(dirs.length).toBe(1)
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = home
+ }
+})
+
test("discovers multiple skills from .opencode/skill/ directory", async () => {
await using tmp = await tmpdir({
git: true,
@@ -183,3 +219,170 @@ test("returns empty array when no skills exist", async () => {
},
})
})
+
+test("discovers skills from .agents/skills/ directory", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const skillDir = path.join(dir, ".agents", "skills", "agent-skill")
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: agent-skill
+description: A skill in the .agents/skills directory.
+---
+
+# Agent Skill
+`,
+ )
+ },
+ })
+
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const skills = await Skill.all()
+ expect(skills.length).toBe(1)
+ const agentSkill = skills.find((s) => s.name === "agent-skill")
+ expect(agentSkill).toBeDefined()
+ expect(agentSkill!.location).toContain(".agents/skills/agent-skill/SKILL.md")
+ },
+ })
+})
+
+test("discovers global skills from ~/.agents/skills/ directory", async () => {
+ await using tmp = await tmpdir({ git: true })
+
+ const originalHome = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ const skillDir = path.join(tmp.path, ".agents", "skills", "global-agent-skill")
+ await fs.mkdir(skillDir, { recursive: true })
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: global-agent-skill
+description: A global skill from ~/.agents/skills for testing.
+---
+
+# Global Agent Skill
+
+This skill is loaded from the global home directory.
+`,
+ )
+
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const skills = await Skill.all()
+ expect(skills.length).toBe(1)
+ expect(skills[0].name).toBe("global-agent-skill")
+ expect(skills[0].description).toBe("A global skill from ~/.agents/skills for testing.")
+ expect(skills[0].location).toContain(".agents/skills/global-agent-skill/SKILL.md")
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = originalHome
+ }
+})
+
+test("discovers skills from both .claude/skills/ and .agents/skills/", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const claudeDir = path.join(dir, ".claude", "skills", "claude-skill")
+ const agentDir = path.join(dir, ".agents", "skills", "agent-skill")
+ await Bun.write(
+ path.join(claudeDir, "SKILL.md"),
+ `---
+name: claude-skill
+description: A skill in the .claude/skills directory.
+---
+
+# Claude Skill
+`,
+ )
+ await Bun.write(
+ path.join(agentDir, "SKILL.md"),
+ `---
+name: agent-skill
+description: A skill in the .agents/skills directory.
+---
+
+# Agent Skill
+`,
+ )
+ },
+ })
+
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const skills = await Skill.all()
+ expect(skills.length).toBe(2)
+ expect(skills.find((s) => s.name === "claude-skill")).toBeDefined()
+ expect(skills.find((s) => s.name === "agent-skill")).toBeDefined()
+ },
+ })
+})
+
+test("properly resolves directories that skills live in", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const opencodeSkillDir = path.join(dir, ".opencode", "skill", "agent-skill")
+ const opencodeSkillsDir = path.join(dir, ".opencode", "skills", "agent-skill")
+ const claudeDir = path.join(dir, ".claude", "skills", "claude-skill")
+ const agentDir = path.join(dir, ".agents", "skills", "agent-skill")
+ await Bun.write(
+ path.join(claudeDir, "SKILL.md"),
+ `---
+name: claude-skill
+description: A skill in the .claude/skills directory.
+---
+
+# Claude Skill
+`,
+ )
+ await Bun.write(
+ path.join(agentDir, "SKILL.md"),
+ `---
+name: agent-skill
+description: A skill in the .agents/skills directory.
+---
+
+# Agent Skill
+`,
+ )
+ await Bun.write(
+ path.join(opencodeSkillDir, "SKILL.md"),
+ `---
+name: opencode-skill
+description: A skill in the .opencode/skill directory.
+---
+
+# OpenCode Skill
+`,
+ )
+ await Bun.write(
+ path.join(opencodeSkillsDir, "SKILL.md"),
+ `---
+name: opencode-skill
+description: A skill in the .opencode/skills directory.
+---
+
+# OpenCode Skill
+`,
+ )
+ },
+ })
+
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const dirs = await Skill.dirs()
+ expect(dirs.length).toBe(4)
+ },
+ })
+})
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
new file mode 100644
index 0000000000..d5057ba9e7
--- /dev/null
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -0,0 +1,112 @@
+import { describe, expect, test } from "bun:test"
+import path from "path"
+import { pathToFileURL } from "url"
+import type { PermissionNext } from "../../src/permission/next"
+import type { Tool } from "../../src/tool/tool"
+import { Instance } from "../../src/project/instance"
+import { SkillTool } from "../../src/tool/skill"
+import { tmpdir } from "../fixture/fixture"
+
+const baseCtx: Omit = {
+ sessionID: "test",
+ messageID: "",
+ callID: "",
+ agent: "build",
+ abort: AbortSignal.any([]),
+ messages: [],
+ metadata: () => {},
+}
+
+describe("tool.skill", () => {
+ test("description lists skill location URL", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const skillDir = path.join(dir, ".opencode", "skill", "tool-skill")
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: tool-skill
+description: Skill for tool tests.
+---
+
+# Tool Skill
+`,
+ )
+ },
+ })
+
+ const home = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const tool = await SkillTool.init()
+ const skillPath = path.join(tmp.path, ".opencode", "skill", "tool-skill", "SKILL.md")
+ expect(tool.description).toContain(`${pathToFileURL(skillPath).href}`)
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = home
+ }
+ })
+
+ test("execute returns skill content block with files", async () => {
+ await using tmp = await tmpdir({
+ git: true,
+ init: async (dir) => {
+ const skillDir = path.join(dir, ".opencode", "skill", "tool-skill")
+ await Bun.write(
+ path.join(skillDir, "SKILL.md"),
+ `---
+name: tool-skill
+description: Skill for tool tests.
+---
+
+# Tool Skill
+
+Use this skill.
+`,
+ )
+ await Bun.write(path.join(skillDir, "scripts", "demo.txt"), "demo")
+ },
+ })
+
+ const home = process.env.OPENCODE_TEST_HOME
+ process.env.OPENCODE_TEST_HOME = tmp.path
+
+ try {
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const tool = await SkillTool.init()
+ const requests: Array> = []
+ const ctx: Tool.Context = {
+ ...baseCtx,
+ ask: async (req) => {
+ requests.push(req)
+ },
+ }
+
+ const result = await tool.execute({ name: "tool-skill" }, ctx)
+ const dir = path.join(tmp.path, ".opencode", "skill", "tool-skill")
+ const file = path.resolve(dir, "scripts", "demo.txt")
+
+ expect(requests.length).toBe(1)
+ expect(requests[0].permission).toBe("skill")
+ expect(requests[0].patterns).toContain("tool-skill")
+ expect(requests[0].always).toContain("tool-skill")
+
+ expect(result.metadata.dir).toBe(dir)
+ expect(result.output).toContain(``)
+ expect(result.output).toContain(`Base directory for this skill: ${pathToFileURL(dir).href}`)
+ expect(result.output).toContain(`${file}`)
+ },
+ })
+ } finally {
+ process.env.OPENCODE_TEST_HOME = home
+ }
+ })
+})
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 5a4afbae43..0482ffa15f 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.1.48",
+ "version": "1.1.49",
"type": "module",
"license": "MIT",
"scripts": {
diff --git a/packages/plugin/src/index.ts b/packages/plugin/src/index.ts
index 86e7ae9342..4cc84a5f32 100644
--- a/packages/plugin/src/index.ts
+++ b/packages/plugin/src/index.ts
@@ -185,6 +185,7 @@ export interface Hooks {
input: { tool: string; sessionID: string; callID: string },
output: { args: any },
) => Promise
+ "shell.env"?: (input: { cwd: string }, output: { env: Record }) => Promise
"tool.execute.after"?: (
input: { tool: string; sessionID: string; callID: string },
output: {
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index f9bf9c1e0b..f8a45019c3 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.1.48",
+ "version": "1.1.49",
"type": "module",
"license": "MIT",
"scripts": {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 0cf70241ef..8050b47d61 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1403,9 +1403,9 @@ export type AgentConfig = {
[key: string]: unknown
}
/**
- * Hex color code for the agent (e.g., #FF5733)
+ * Hex color code (e.g., #FF5733) or theme color (e.g., primary)
*/
- color?: string
+ color?: string | "primary" | "secondary" | "accent" | "success" | "warning" | "error" | "info"
/**
* Maximum number of agentic iterations before forcing text-only response
*/
@@ -1430,6 +1430,13 @@ export type AgentConfig = {
[key: string]: unknown
}
| string
+ | "primary"
+ | "secondary"
+ | "accent"
+ | "success"
+ | "warning"
+ | "error"
+ | "info"
| number
| PermissionConfig
| undefined
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index d179ed8b8c..3c70324649 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -9071,9 +9071,17 @@
"additionalProperties": {}
},
"color": {
- "description": "Hex color code for the agent (e.g., #FF5733)",
- "type": "string",
- "pattern": "^#[0-9a-fA-F]{6}$"
+ "description": "Hex color code (e.g., #FF5733) or theme color (e.g., primary)",
+ "anyOf": [
+ {
+ "type": "string",
+ "pattern": "^#[0-9a-fA-F]{6}$"
+ },
+ {
+ "type": "string",
+ "enum": ["primary", "secondary", "accent", "success", "warning", "error", "info"]
+ }
+ ]
},
"steps": {
"description": "Maximum number of agentic iterations before forcing text-only response",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index 3f5a30fadc..1e7586dd69 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/slack",
- "version": "1.1.48",
+ "version": "1.1.49",
"type": "module",
"license": "MIT",
"scripts": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7692331192..9826e10429 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/ui",
- "version": "1.1.48",
+ "version": "1.1.49",
"type": "module",
"license": "MIT",
"exports": {
diff --git a/packages/ui/src/components/tooltip.tsx b/packages/ui/src/components/tooltip.tsx
index 37517fb346..b55265b794 100644
--- a/packages/ui/src/components/tooltip.tsx
+++ b/packages/ui/src/components/tooltip.tsx
@@ -63,7 +63,7 @@ export function Tooltip(props: TooltipProps) {
{local.children}
-
+
{c()}
diff --git a/packages/util/package.json b/packages/util/package.json
index 9a3f13b10d..92adc64687 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/util",
- "version": "1.1.48",
+ "version": "1.1.49",
"private": true,
"type": "module",
"license": "MIT",
diff --git a/packages/web/package.json b/packages/web/package.json
index 2db4cffe99..9e63b4a7d6 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
"name": "@opencode-ai/web",
"type": "module",
"license": "MIT",
- "version": "1.1.48",
+ "version": "1.1.49",
"scripts": {
"dev": "astro dev",
"dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
diff --git a/packages/web/src/content/docs/agents.mdx b/packages/web/src/content/docs/agents.mdx
index 62957ad911..755c4ba25a 100644
--- a/packages/web/src/content/docs/agents.mdx
+++ b/packages/web/src/content/docs/agents.mdx
@@ -576,18 +576,21 @@ Users can always invoke any subagent directly via the `@` autocomplete menu, eve
Customize the agent's visual appearance in the UI with the `color` option. This affects how the agent appears in the interface.
+Use a valid hex color (e.g., `#FF5733`) or theme color: `primary`, `secondary`, `accent`, `success`, `warning`, `error`, `info`.
+
```json title="opencode.json"
{
"agent": {
"creative": {
"color": "#ff6b6b"
+ },
+ "code-reviewer": {
+ "color": "accent"
}
}
}
```
-Must be a valid hex color code like `#FF5733`.
-
---
### Top P
diff --git a/packages/web/src/content/docs/cli.mdx b/packages/web/src/content/docs/cli.mdx
index 7fb948f505..2d68e17732 100644
--- a/packages/web/src/content/docs/cli.mdx
+++ b/packages/web/src/content/docs/cli.mdx
@@ -569,10 +569,14 @@ OpenCode can be configured using environment variables.
| `OPENCODE_DISABLE_CLAUDE_CODE` | boolean | Disable reading from `.claude` (prompt + skills) |
| `OPENCODE_DISABLE_CLAUDE_CODE_PROMPT` | boolean | Disable reading `~/.claude/CLAUDE.md` |
| `OPENCODE_DISABLE_CLAUDE_CODE_SKILLS` | boolean | Disable loading `.claude/skills` |
+| `OPENCODE_DISABLE_MODELS_FETCH` | boolean | Disable fetching models from remote sources |
+| `OPENCODE_FAKE_VCS` | string | Fake VCS provider for testing purposes |
+| `OPENCODE_DISABLE_FILETIME_CHECK` | boolean | Disable file time checking for optimization |
| `OPENCODE_CLIENT` | string | Client identifier (defaults to `cli`) |
| `OPENCODE_ENABLE_EXA` | boolean | Enable Exa web search tools |
| `OPENCODE_SERVER_PASSWORD` | string | Enable basic auth for `serve`/`web` |
| `OPENCODE_SERVER_USERNAME` | string | Override basic auth username (default `opencode`) |
+| `OPENCODE_MODELS_URL` | string | Custom URL for fetching models configuration |
---
diff --git a/packages/web/src/content/docs/config.mdx b/packages/web/src/content/docs/config.mdx
index 1474cb9155..5cc9d8666a 100644
--- a/packages/web/src/content/docs/config.mdx
+++ b/packages/web/src/content/docs/config.mdx
@@ -190,6 +190,7 @@ You can configure server settings for the `opencode serve` and `opencode web` co
"port": 4096,
"hostname": "0.0.0.0",
"mdns": true,
+ "mdnsDomain": "myproject.local",
"cors": ["http://localhost:5173"]
}
}
@@ -200,6 +201,7 @@ Available options:
- `port` - Port to listen on.
- `hostname` - Hostname to listen on. When `mdns` is enabled and no hostname is set, defaults to `0.0.0.0`.
- `mdns` - Enable mDNS service discovery. This allows other devices on the network to discover your OpenCode server.
+- `mdnsDomain` - Custom domain name for mDNS service. Defaults to `opencode.local`. Useful for running multiple instances on the same network.
- `cors` - Additional origins to allow for CORS when using the HTTP server from a browser-based client. Values must be full origins (scheme + host + optional port), eg `https://app.example.com`.
[Learn more about the server here](/docs/server).
diff --git a/packages/web/src/content/docs/plugins.mdx b/packages/web/src/content/docs/plugins.mdx
index ba530a6d9b..411b827d22 100644
--- a/packages/web/src/content/docs/plugins.mdx
+++ b/packages/web/src/content/docs/plugins.mdx
@@ -192,6 +192,10 @@ Plugins can subscribe to events as seen below in the Examples section. Here is a
- `todo.updated`
+#### Shell Events
+
+- `shell.env`
+
#### Tool Events
- `tool.execute.after`
@@ -254,6 +258,23 @@ export const EnvProtection = async ({ project, client, $, directory, worktree })
---
+### Inject environment variables
+
+Inject environment variables into all shell execution (AI tools and user terminals):
+
+```javascript title=".opencode/plugins/inject-env.js"
+export const InjectEnvPlugin = async () => {
+ return {
+ "shell.env": async (input, output) => {
+ output.env.MY_API_KEY = "secret"
+ output.env.PROJECT_ROOT = input.cwd
+ },
+ }
+}
+```
+
+---
+
### Custom tools
Plugins can also add custom tools to opencode:
@@ -296,10 +317,12 @@ Use `client.app.log()` instead of `console.log` for structured logging:
```ts title=".opencode/plugins/my-plugin.ts"
export const MyPlugin = async ({ client }) => {
await client.app.log({
- service: "my-plugin",
- level: "info",
- message: "Plugin initialized",
- extra: { foo: "bar" },
+ body: {
+ service: "my-plugin",
+ level: "info",
+ message: "Plugin initialized",
+ extra: { foo: "bar" },
+ },
})
}
```
diff --git a/packages/web/src/content/docs/server.mdx b/packages/web/src/content/docs/server.mdx
index 7229e09b22..4510bd4981 100644
--- a/packages/web/src/content/docs/server.mdx
+++ b/packages/web/src/content/docs/server.mdx
@@ -18,12 +18,13 @@ opencode serve [--port ] [--hostname ] [--cors ]
#### Options
-| Flag | Description | Default |
-| ------------ | ----------------------------------- | ----------- |
-| `--port` | Port to listen on | `4096` |
-| `--hostname` | Hostname to listen on | `127.0.0.1` |
-| `--mdns` | Enable mDNS discovery | `false` |
-| `--cors` | Additional browser origins to allow | `[]` |
+| Flag | Description | Default |
+| --------------- | ----------------------------------- | ---------------- |
+| `--port` | Port to listen on | `4096` |
+| `--hostname` | Hostname to listen on | `127.0.0.1` |
+| `--mdns` | Enable mDNS discovery | `false` |
+| `--mdns-domain` | Custom domain name for mDNS service | `opencode.local` |
+| `--cors` | Additional browser origins to allow | `[]` |
`--cors` can be passed multiple times:
diff --git a/packages/web/src/content/docs/web.mdx b/packages/web/src/content/docs/web.mdx
index 1013712f3a..52b97460c4 100644
--- a/packages/web/src/content/docs/web.mdx
+++ b/packages/web/src/content/docs/web.mdx
@@ -64,6 +64,12 @@ opencode web --mdns
This automatically sets the hostname to `0.0.0.0` and advertises the server as `opencode.local`.
+You can customize the mDNS domain name to run multiple instances on the same network:
+
+```bash
+opencode web --mdns --mdns-domain myproject.local
+```
+
### CORS
To allow additional domains for CORS (useful for custom frontends):
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index 2f4a499645..9d90b2c660 100644
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
"name": "opencode",
"displayName": "opencode",
"description": "opencode for VS Code",
- "version": "1.1.48",
+ "version": "1.1.49",
"publisher": "sst-dev",
"repository": {
"type": "git",