diff --git a/.gitignore b/.gitignore index ce3d19e778..bf78c046d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ target opencode-dev logs/ *.bun-build +tsconfig.tsbuildinfo diff --git a/bun.lock b/bun.lock index ebcb54a9d8..2240f30558 100644 --- a/bun.lock +++ b/bun.lock @@ -25,7 +25,7 @@ }, "packages/app": { "name": "@opencode-ai/app", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@kobalte/core": "catalog:", "@opencode-ai/sdk": "workspace:*", @@ -75,7 +75,7 @@ }, "packages/console/app": { "name": "@opencode-ai/console-app", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@cloudflare/vite-plugin": "1.15.2", "@ibm/plex": "6.4.1", @@ -109,7 +109,7 @@ }, "packages/console/core": { "name": "@opencode-ai/console-core", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@aws-sdk/client-sts": "3.782.0", "@jsx-email/render": "1.1.1", @@ -136,7 +136,7 @@ }, "packages/console/function": { "name": "@opencode-ai/console-function", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@ai-sdk/anthropic": "2.0.0", "@ai-sdk/openai": "2.0.2", @@ -160,7 +160,7 @@ }, "packages/console/mail": { "name": "@opencode-ai/console-mail", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@jsx-email/all": "2.2.3", "@jsx-email/cli": "1.4.3", @@ -184,7 +184,7 @@ }, "packages/desktop": { "name": "@opencode-ai/desktop", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@opencode-ai/app": "workspace:*", "@opencode-ai/ui": "workspace:*", @@ -217,7 +217,7 @@ }, "packages/enterprise": { "name": "@opencode-ai/enterprise", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@opencode-ai/ui": "workspace:*", "@opencode-ai/util": "workspace:*", @@ -246,7 +246,7 @@ }, "packages/function": { "name": "@opencode-ai/function", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@octokit/auth-app": "8.0.1", "@octokit/rest": "catalog:", @@ -262,7 +262,7 @@ }, "packages/opencode": { "name": "opencode", - "version": "1.2.8", + "version": "1.2.9", "bin": { "opencode": "./bin/opencode", }, @@ -376,7 +376,7 @@ }, "packages/plugin": { "name": "@opencode-ai/plugin", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@opencode-ai/sdk": "workspace:*", "zod": "catalog:", @@ -396,7 +396,7 @@ }, "packages/sdk/js": { "name": "@opencode-ai/sdk", - "version": "1.2.8", + "version": "1.2.9", "devDependencies": { "@hey-api/openapi-ts": "0.90.10", "@tsconfig/node22": "catalog:", @@ -407,7 +407,7 @@ }, "packages/slack": { "name": "@opencode-ai/slack", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@opencode-ai/sdk": "workspace:*", "@slack/bolt": "^3.17.1", @@ -420,7 +420,7 @@ }, "packages/ui": { "name": "@opencode-ai/ui", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@kobalte/core": "catalog:", "@opencode-ai/sdk": "workspace:*", @@ -462,7 +462,7 @@ }, "packages/util": { "name": "@opencode-ai/util", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "zod": "catalog:", }, @@ -473,7 +473,7 @@ }, "packages/web": { "name": "@opencode-ai/web", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@astrojs/cloudflare": "12.6.3", "@astrojs/markdown-remark": "6.3.1", diff --git a/packages/app/package.json b/packages/app/package.json index 254937acc7..385205a0c1 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/app", - "version": "1.2.8", + "version": "1.2.9", "description": "", "type": "module", "exports": { diff --git a/packages/app/src/components/settings-general.tsx b/packages/app/src/components/settings-general.tsx index 9ccf50513a..df71fd77e8 100644 --- a/packages/app/src/components/settings-general.tsx +++ b/packages/app/src/components/settings-general.tsx @@ -418,7 +418,7 @@ export const SettingsGeneral: Component = () => { return (
-
+

{language.t("settings.tab.general")}

diff --git a/packages/app/src/components/settings-keybinds.tsx b/packages/app/src/components/settings-keybinds.tsx index bcc731af99..94bc76d76a 100644 --- a/packages/app/src/components/settings-keybinds.tsx +++ b/packages/app/src/components/settings-keybinds.tsx @@ -370,7 +370,7 @@ export const SettingsKeybinds: Component = () => { return (
-
+

{language.t("settings.shortcuts.title")}

diff --git a/packages/app/src/components/settings-models.tsx b/packages/app/src/components/settings-models.tsx index 3a0b7a4fb1..07f6d30e18 100644 --- a/packages/app/src/components/settings-models.tsx +++ b/packages/app/src/components/settings-models.tsx @@ -59,7 +59,7 @@ export const SettingsModels: Component = () => { return (
-
+

{language.t("settings.models.title")}

diff --git a/packages/app/src/components/settings-permissions.tsx b/packages/app/src/components/settings-permissions.tsx index 348854491a..5c922ba44a 100644 --- a/packages/app/src/components/settings-permissions.tsx +++ b/packages/app/src/components/settings-permissions.tsx @@ -177,7 +177,7 @@ export const SettingsPermissions: Component = () => { return (
-
+

{language.t("settings.permissions.title")}

{language.t("settings.permissions.description")}

diff --git a/packages/app/src/components/settings-providers.tsx b/packages/app/src/components/settings-providers.tsx index a3375c9c60..d1837ee607 100644 --- a/packages/app/src/components/settings-providers.tsx +++ b/packages/app/src/components/settings-providers.tsx @@ -132,7 +132,7 @@ export const SettingsProviders: Component = () => { return (
-
+

{language.t("settings.providers.title")}

diff --git a/packages/console/app/package.json b/packages/console/app/package.json index 4840a84e56..acea3fd6a4 100644 --- a/packages/console/app/package.json +++ b/packages/console/app/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/console-app", - "version": "1.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/console/core/package.json b/packages/console/core/package.json index 9cf9312209..f5b0b3965b 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.2.8", + "version": "1.2.9", "private": true, "type": "module", "license": "MIT", diff --git a/packages/console/function/package.json b/packages/console/function/package.json index 0f76e16103..d054585834 100644 --- a/packages/console/function/package.json +++ b/packages/console/function/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/console-function", - "version": "1.2.8", + "version": "1.2.9", "$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 4712046a3f..bcadba0005 100644 --- a/packages/console/mail/package.json +++ b/packages/console/mail/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/console-mail", - "version": "1.2.8", + "version": "1.2.9", "dependencies": { "@jsx-email/all": "2.2.3", "@jsx-email/cli": "1.4.3", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 50dfae8c9f..2eb532807e 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@opencode-ai/desktop", "private": true, - "version": "1.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs index c6a7d13e68..7ea3aaa8a7 100644 --- a/packages/desktop/src-tauri/src/lib.rs +++ b/packages/desktop/src-tauri/src/lib.rs @@ -40,7 +40,9 @@ use crate::windows::{LoadingWindow, MainWindow}; #[derive(Clone, serde::Serialize, specta::Type, Debug)] struct ServerReadyData { url: String, + username: Option, password: Option, + is_sidecar: bool } #[derive(Clone, Copy, serde::Serialize, specta::Type, Debug)] @@ -605,6 +607,7 @@ async fn initialize(app: AppHandle) { child, health_check, url, + username, password, } => { let app = app.clone(); @@ -631,7 +634,7 @@ async fn initialize(app: AppHandle) { app.state::().set_child(Some(child)); - Ok(ServerReadyData { url, password }) + Ok(ServerReadyData { url, username,password, is_sidecar: true }) } .map(move |res| { let _ = server_ready_tx.send(res); @@ -641,7 +644,9 @@ async fn initialize(app: AppHandle) { ServerConnection::Existing { url } => { let _ = server_ready_tx.send(Ok(ServerReadyData { url: url.to_string(), + username: None, password: None, + is_sidecar: false, })); None } @@ -719,6 +724,7 @@ enum ServerConnection { }, CLI { url: String, + username: Option, password: Option, child: CommandChild, health_check: server::HealthCheck, @@ -730,11 +736,15 @@ async fn setup_server_connection(app: AppHandle) -> ServerConnection { tracing::info!(?custom_url, "Attempting server connection"); - if let Some(url) = custom_url - && server::check_health_or_ask_retry(&app, &url).await + if let Some(url) = &custom_url + && server::check_health_or_ask_retry(&app, url).await { tracing::info!(%url, "Connected to custom server"); - return ServerConnection::Existing { url: url.clone() }; + // If the default server is already local, no need to also spawn a sidecar + if server::is_localhost_url(url) { + return ServerConnection::Existing { url: url.clone() }; + } + // Remote default server: fall through and also spawn a local sidecar } let local_port = get_sidecar_port(); @@ -755,6 +765,7 @@ async fn setup_server_connection(app: AppHandle) -> ServerConnection { ServerConnection::CLI { url: local_url, + username: Some("opencode".to_string()), password: Some(password), child, health_check, diff --git a/packages/desktop/src-tauri/src/server.rs b/packages/desktop/src-tauri/src/server.rs index a13b450bb3..2c43c1cc8c 100644 --- a/packages/desktop/src-tauri/src/server.rs +++ b/packages/desktop/src-tauri/src/server.rs @@ -150,7 +150,7 @@ pub async fn check_health(url: &str, password: Option<&str>) -> bool { return false; }; - let mut builder = reqwest::Client::builder().timeout(Duration::from_secs(3)); + let mut builder = reqwest::Client::builder().timeout(Duration::from_secs(7)); if url_is_localhost(&url) { // Some environments set proxy variables (HTTP_PROXY/HTTPS_PROXY/ALL_PROXY) without @@ -178,6 +178,10 @@ pub async fn check_health(url: &str, password: Option<&str>) -> bool { .unwrap_or(false) } +pub fn is_localhost_url(url: &str) -> bool { + reqwest::Url::parse(url).is_ok_and(|u| url_is_localhost(&u)) +} + fn url_is_localhost(url: &reqwest::Url) -> bool { url.host_str().is_some_and(|host| { host.eq_ignore_ascii_case("localhost") diff --git a/packages/desktop/src/bindings.ts b/packages/desktop/src/bindings.ts index 67816ad414..6d05bfc56e 100644 --- a/packages/desktop/src/bindings.ts +++ b/packages/desktop/src/bindings.ts @@ -35,7 +35,9 @@ export type LoadingWindowComplete = null; export type ServerReadyData = { url: string, + username: string | null, password: string | null, + is_sidecar: boolean, }; export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" }; diff --git a/packages/desktop/src/index.tsx b/packages/desktop/src/index.tsx index 98af589dda..4a28e1b49d 100644 --- a/packages/desktop/src/index.tsx +++ b/packages/desktop/src/index.tsx @@ -23,7 +23,7 @@ import { relaunch } from "@tauri-apps/plugin-process" import { open as shellOpen } from "@tauri-apps/plugin-shell" import { Store } from "@tauri-apps/plugin-store" import { check, type Update } from "@tauri-apps/plugin-updater" -import { type Accessor, createResource, type JSX, onCleanup, onMount, Show } from "solid-js" +import { createResource, type JSX, onCleanup, onMount, Show } from "solid-js" import { render } from "solid-js/web" import pkg from "../package.json" import { initI18n, t } from "./i18n" @@ -31,7 +31,7 @@ import { UPDATER_ENABLED } from "./updater" import { webviewZoom } from "./webview-zoom" import "./styles.css" import { Channel } from "@tauri-apps/api/core" -import { commands, type InitStep } from "./bindings" +import { commands, ServerReadyData, type InitStep } from "./bindings" import { createMenu } from "./menu" const root = document.getElementById("root") @@ -452,16 +452,19 @@ render(() => { {(data) => { - const server: ServerConnection.Sidecar = { - displayName: "Local Server", - type: "sidecar", - variant: "base", - http: { - url: data().url, - username: "opencode", - password: data().password ?? undefined, - }, + const http = { + url: data.url, + username: data.username ?? undefined, + password: data.password ?? undefined, } + const server: ServerConnection.Any = data.is_sidecar + ? { + displayName: "Local Server", + type: "sidecar", + variant: "base", + http, + } + : { type: "http", http } function Inner() { const cmd = useCommand() @@ -485,10 +488,8 @@ render(() => { ) }, root!) -type ServerReadyData = { url: string; password: string | null } - // Gate component that waits for the server to be ready -function ServerGate(props: { children: (data: Accessor) => JSX.Element }) { +function ServerGate(props: { children: (data: ServerReadyData) => JSX.Element }) { const [serverData] = createResource(() => commands.awaitInitialization(new Channel() as any)) return ( @@ -516,7 +517,7 @@ function ServerGate(props: { children: (data: Accessor) => JSX.
} > - {(data) => props.children(data)} + {(data) => props.children(data())} ) diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json index bb8dda1c75..04d42b55f6 100644 --- a/packages/enterprise/package.json +++ b/packages/enterprise/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/enterprise", - "version": "1.2.8", + "version": "1.2.9", "private": true, "type": "module", "license": "MIT", diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml index 42afa53981..d4c308fc50 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.2.8" +version = "1.2.9" 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.2.8/opencode-darwin-arm64.zip" +archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.9/opencode-darwin-arm64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.darwin-x86_64] -archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.8/opencode-darwin-x64.zip" +archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.9/opencode-darwin-x64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.linux-aarch64] -archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.8/opencode-linux-arm64.tar.gz" +archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.9/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.2.8/opencode-linux-x64.tar.gz" +archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.9/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.2.8/opencode-windows-x64.zip" +archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.9/opencode-windows-x64.zip" cmd = "./opencode.exe" args = ["acp"] diff --git a/packages/function/package.json b/packages/function/package.json index 4d7a9744e1..b8b3f45f22 100644 --- a/packages/function/package.json +++ b/packages/function/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/function", - "version": "1.2.8", + "version": "1.2.9", "$schema": "https://json.schemastore.org/package.json", "private": true, "type": "module", diff --git a/packages/opencode/package.json b/packages/opencode/package.json index 89b66e32b3..f9e66d61d5 100644 --- a/packages/opencode/package.json +++ b/packages/opencode/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "version": "1.2.8", + "version": "1.2.9", "name": "opencode", "type": "module", "license": "MIT", diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx index 62cab52aba..497b0bad5e 100644 --- a/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx @@ -2,8 +2,7 @@ import path from "path" import { Global } from "@/global" import { Filesystem } from "@/util/filesystem" import { onMount } from "solid-js" -import { createStore, produce } from "solid-js/store" -import { clone } from "remeda" +import { createStore, produce, unwrap } from "solid-js/store" import { createSimpleContext } from "../../context/helper" import { appendFile, writeFile } from "fs/promises" import type { AgentPart, FilePart, TextPart } from "@opencode-ai/sdk/v2" @@ -84,7 +83,7 @@ export const { use: usePromptHistory, provider: PromptHistoryProvider } = create }, append(item: PromptInfo) { if (store.history.at(-1)?.input === item.input) return - const entry = clone(item) + const entry = structuredClone(unwrap(item)) let trimmed = false setStore( produce((draft) => { diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/stash.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/stash.tsx index d4dc138d89..ef3eb329a9 100644 --- a/packages/opencode/src/cli/cmd/tui/component/prompt/stash.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/prompt/stash.tsx @@ -2,8 +2,7 @@ import path from "path" import { Global } from "@/global" import { Filesystem } from "@/util/filesystem" import { onMount } from "solid-js" -import { createStore, produce } from "solid-js/store" -import { clone } from "remeda" +import { createStore, produce, unwrap } from "solid-js/store" import { createSimpleContext } from "../../context/helper" import { appendFile, writeFile } from "fs/promises" import type { PromptInfo } from "./history" @@ -53,7 +52,7 @@ export const { use: usePromptStash, provider: PromptStashProvider } = createSimp return store.entries }, push(entry: Omit) { - const stash = clone({ ...entry, timestamp: Date.now() }) + const stash = structuredClone(unwrap({ ...entry, timestamp: Date.now() })) let trimmed = false setStore( produce((draft) => { diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts index fa88039127..4e42fb0d2e 100644 --- a/packages/opencode/src/session/llm.ts +++ b/packages/opencode/src/session/llm.ts @@ -11,7 +11,7 @@ import { tool, jsonSchema, } from "ai" -import { clone, mergeDeep, pipe } from "remeda" +import { mergeDeep, pipe } from "remeda" import { ProviderTransform } from "@/provider/transform" import { Config } from "@/config/config" import { Instance } from "@/project/instance" @@ -80,15 +80,11 @@ export namespace LLM { ) const header = system[0] - const original = clone(system) await Plugin.trigger( "experimental.chat.system.transform", { sessionID: input.sessionID, model: input.model }, { system }, ) - if (system.length === 0) { - system.push(...original) - } // rejoin to maintain 2-part structure for caching if header unchanged if (system.length > 2 && system[0] === header) { const rest = system.slice(1) diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts index 6ca93979e3..75bd3c9dfa 100644 --- a/packages/opencode/src/session/prompt.ts +++ b/packages/opencode/src/session/prompt.ts @@ -22,7 +22,6 @@ import PROMPT_PLAN from "../session/prompt/plan.txt" import BUILD_SWITCH from "../session/prompt/build-switch.txt" import MAX_STEPS from "../session/prompt/max-steps.txt" import { defer } from "../util/defer" -import { clone } from "remeda" import { ToolRegistry } from "../tool/registry" import { MCP } from "../mcp" import { LSP } from "../lsp" @@ -627,11 +626,9 @@ export namespace SessionPrompt { }) } - const sessionMessages = clone(msgs) - // Ephemerally wrap queued user messages with a reminder to stay on track if (step > 1 && lastFinished) { - for (const msg of sessionMessages) { + for (const msg of msgs) { if (msg.info.role !== "user" || msg.info.id <= lastFinished.id) continue for (const part of msg.parts) { if (part.type !== "text" || part.ignored || part.synthetic) continue @@ -648,7 +645,7 @@ export namespace SessionPrompt { } } - await Plugin.trigger("experimental.chat.messages.transform", {}, { messages: sessionMessages }) + await Plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs }) // Build system prompt, adding structured output instruction if needed const system = [...(await SystemPrompt.environment(model)), ...(await InstructionPrompt.system())] @@ -664,7 +661,7 @@ export namespace SessionPrompt { sessionID, system, messages: [ - ...MessageV2.toModelMessages(sessionMessages, model), + ...MessageV2.toModelMessages(msgs, model), ...(isLastStep ? [ { @@ -909,7 +906,12 @@ export namespace SessionPrompt { title: "", metadata, output: truncated.content, - attachments, + attachments: attachments.map((attachment) => ({ + ...attachment, + id: Identifier.ascending("part"), + sessionID: ctx.sessionID, + messageID: input.processor.message.id, + })), content: result.content, // directly return content to preserve ordering when outputting to model } } diff --git a/packages/opencode/test/session/llm.test.ts b/packages/opencode/test/session/llm.test.ts index d7af9908f7..a89a00ebc0 100644 --- a/packages/opencode/test/session/llm.test.ts +++ b/packages/opencode/test/session/llm.test.ts @@ -307,7 +307,6 @@ describe("session.llm.stream", () => { expect(url.pathname.startsWith("/v1/")).toBe(true) expect(url.pathname.endsWith("/chat/completions")).toBe(true) expect(headers.get("Authorization")).toBe("Bearer test-key") - expect(headers.get("User-Agent") ?? "").toMatch(/^opencode\//) expect(body.model).toBe(resolved.api.id) expect(body.temperature).toBe(0.4) diff --git a/packages/opencode/test/session/prompt-missing-file.test.ts b/packages/opencode/test/session/prompt-missing-file.test.ts deleted file mode 100644 index c3f52f56cc..0000000000 --- a/packages/opencode/test/session/prompt-missing-file.test.ts +++ /dev/null @@ -1,104 +0,0 @@ -import path from "path" -import { describe, expect, test } from "bun:test" -import { Instance } from "../../src/project/instance" -import { Session } from "../../src/session" -import { MessageV2 } from "../../src/session/message-v2" -import { SessionPrompt } from "../../src/session/prompt" -import { tmpdir } from "../fixture/fixture" - -describe("session.prompt missing file", () => { - test("does not fail the prompt when a file part is missing", async () => { - await using tmp = await tmpdir({ - git: true, - config: { - agent: { - build: { - model: "openai/gpt-5.2", - }, - }, - }, - }) - - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const session = await Session.create({}) - - const missing = path.join(tmp.path, "does-not-exist.ts") - const msg = await SessionPrompt.prompt({ - sessionID: session.id, - agent: "build", - noReply: true, - parts: [ - { type: "text", text: "please review @does-not-exist.ts" }, - { - type: "file", - mime: "text/plain", - url: `file://${missing}`, - filename: "does-not-exist.ts", - }, - ], - }) - - if (msg.info.role !== "user") throw new Error("expected user message") - - const hasFailure = msg.parts.some( - (part) => part.type === "text" && part.synthetic && part.text.includes("Read tool failed to read"), - ) - expect(hasFailure).toBe(true) - - await Session.remove(session.id) - }, - }) - }) - - test("keeps stored part order stable when file resolution is async", async () => { - await using tmp = await tmpdir({ - git: true, - config: { - agent: { - build: { - model: "openai/gpt-5.2", - }, - }, - }, - }) - - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const session = await Session.create({}) - - const missing = path.join(tmp.path, "still-missing.ts") - const msg = await SessionPrompt.prompt({ - sessionID: session.id, - agent: "build", - noReply: true, - parts: [ - { - type: "file", - mime: "text/plain", - url: `file://${missing}`, - filename: "still-missing.ts", - }, - { type: "text", text: "after-file" }, - ], - }) - - if (msg.info.role !== "user") throw new Error("expected user message") - - const stored = await MessageV2.get({ - sessionID: session.id, - messageID: msg.info.id, - }) - const text = stored.parts.filter((part) => part.type === "text").map((part) => part.text) - - expect(text[0]?.startsWith("Called the Read tool with the following input:")).toBe(true) - expect(text[1]?.includes("Read tool failed to read")).toBe(true) - expect(text[2]).toBe("after-file") - - await Session.remove(session.id) - }, - }) - }) -}) diff --git a/packages/opencode/test/session/prompt-special-chars.test.ts b/packages/opencode/test/session/prompt-special-chars.test.ts deleted file mode 100644 index dce0b00495..0000000000 --- a/packages/opencode/test/session/prompt-special-chars.test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import path from "path" -import { describe, expect, test } from "bun:test" -import { fileURLToPath } from "url" -import { Instance } from "../../src/project/instance" -import { Log } from "../../src/util/log" -import { Session } from "../../src/session" -import { SessionPrompt } from "../../src/session/prompt" -import { MessageV2 } from "../../src/session/message-v2" -import { tmpdir } from "../fixture/fixture" - -Log.init({ print: false }) - -describe("session.prompt special characters", () => { - test("handles filenames with # character", async () => { - await using tmp = await tmpdir({ - git: true, - init: async (dir) => { - await Bun.write(path.join(dir, "file#name.txt"), "special content\n") - }, - }) - - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const session = await Session.create({}) - const template = "Read @file#name.txt" - const parts = await SessionPrompt.resolvePromptParts(template) - const fileParts = parts.filter((part) => part.type === "file") - - expect(fileParts.length).toBe(1) - expect(fileParts[0].filename).toBe("file#name.txt") - - // Verify the URL is properly encoded (# should be %23) - expect(fileParts[0].url).toContain("%23") - - // Verify the URL can be correctly converted back to a file path - const decodedPath = fileURLToPath(fileParts[0].url) - expect(decodedPath).toBe(path.join(tmp.path, "file#name.txt")) - - const message = await SessionPrompt.prompt({ - sessionID: session.id, - parts, - noReply: true, - }) - const stored = await MessageV2.get({ sessionID: session.id, messageID: message.info.id }) - - // Verify the file content was read correctly - const textParts = stored.parts.filter((part) => part.type === "text") - const hasContent = textParts.some((part) => part.text.includes("special content")) - expect(hasContent).toBe(true) - - await Session.remove(session.id) - }, - }) - }) -}) diff --git a/packages/opencode/test/session/prompt-variant.test.ts b/packages/opencode/test/session/prompt-variant.test.ts deleted file mode 100644 index 83ae175c6e..0000000000 --- a/packages/opencode/test/session/prompt-variant.test.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { describe, expect, test } from "bun:test" -import { Instance } from "../../src/project/instance" -import { Session } from "../../src/session" -import { SessionPrompt } from "../../src/session/prompt" -import { tmpdir } from "../fixture/fixture" - -describe("session.prompt agent variant", () => { - test("applies agent variant only when using agent model", async () => { - const prev = process.env.OPENAI_API_KEY - process.env.OPENAI_API_KEY = "test-openai-key" - - try { - await using tmp = await tmpdir({ - git: true, - config: { - agent: { - build: { - model: "openai/gpt-5.2", - variant: "xhigh", - }, - }, - }, - }) - - await Instance.provide({ - directory: tmp.path, - fn: async () => { - const session = await Session.create({}) - - const other = await SessionPrompt.prompt({ - sessionID: session.id, - agent: "build", - model: { providerID: "opencode", modelID: "kimi-k2.5-free" }, - noReply: true, - parts: [{ type: "text", text: "hello" }], - }) - if (other.info.role !== "user") throw new Error("expected user message") - expect(other.info.variant).toBeUndefined() - - const match = await SessionPrompt.prompt({ - sessionID: session.id, - agent: "build", - noReply: true, - parts: [{ type: "text", text: "hello again" }], - }) - if (match.info.role !== "user") throw new Error("expected user message") - expect(match.info.model).toEqual({ providerID: "openai", modelID: "gpt-5.2" }) - expect(match.info.variant).toBe("xhigh") - - const override = await SessionPrompt.prompt({ - sessionID: session.id, - agent: "build", - noReply: true, - variant: "high", - parts: [{ type: "text", text: "hello third" }], - }) - if (override.info.role !== "user") throw new Error("expected user message") - expect(override.info.variant).toBe("high") - - await Session.remove(session.id) - }, - }) - } finally { - if (prev === undefined) delete process.env.OPENAI_API_KEY - else process.env.OPENAI_API_KEY = prev - } - }) -}) diff --git a/packages/opencode/test/session/prompt.test.ts b/packages/opencode/test/session/prompt.test.ts new file mode 100644 index 0000000000..e8a8c65b03 --- /dev/null +++ b/packages/opencode/test/session/prompt.test.ts @@ -0,0 +1,211 @@ +import path from "path" +import { describe, expect, test } from "bun:test" +import { fileURLToPath } from "url" +import { Instance } from "../../src/project/instance" +import { Session } from "../../src/session" +import { MessageV2 } from "../../src/session/message-v2" +import { SessionPrompt } from "../../src/session/prompt" +import { Log } from "../../src/util/log" +import { tmpdir } from "../fixture/fixture" + +Log.init({ print: false }) + +describe("session.prompt missing file", () => { + test("does not fail the prompt when a file part is missing", async () => { + await using tmp = await tmpdir({ + git: true, + config: { + agent: { + build: { + model: "openai/gpt-5.2", + }, + }, + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const session = await Session.create({}) + + const missing = path.join(tmp.path, "does-not-exist.ts") + const msg = await SessionPrompt.prompt({ + sessionID: session.id, + agent: "build", + noReply: true, + parts: [ + { type: "text", text: "please review @does-not-exist.ts" }, + { + type: "file", + mime: "text/plain", + url: `file://${missing}`, + filename: "does-not-exist.ts", + }, + ], + }) + + if (msg.info.role !== "user") throw new Error("expected user message") + + const hasFailure = msg.parts.some( + (part) => part.type === "text" && part.synthetic && part.text.includes("Read tool failed to read"), + ) + expect(hasFailure).toBe(true) + + await Session.remove(session.id) + }, + }) + }) + + test("keeps stored part order stable when file resolution is async", async () => { + await using tmp = await tmpdir({ + git: true, + config: { + agent: { + build: { + model: "openai/gpt-5.2", + }, + }, + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const session = await Session.create({}) + + const missing = path.join(tmp.path, "still-missing.ts") + const msg = await SessionPrompt.prompt({ + sessionID: session.id, + agent: "build", + noReply: true, + parts: [ + { + type: "file", + mime: "text/plain", + url: `file://${missing}`, + filename: "still-missing.ts", + }, + { type: "text", text: "after-file" }, + ], + }) + + if (msg.info.role !== "user") throw new Error("expected user message") + + const stored = await MessageV2.get({ + sessionID: session.id, + messageID: msg.info.id, + }) + const text = stored.parts.filter((part) => part.type === "text").map((part) => part.text) + + expect(text[0]?.startsWith("Called the Read tool with the following input:")).toBe(true) + expect(text[1]?.includes("Read tool failed to read")).toBe(true) + expect(text[2]).toBe("after-file") + + await Session.remove(session.id) + }, + }) + }) +}) + +describe("session.prompt special characters", () => { + test("handles filenames with # character", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + await Bun.write(path.join(dir, "file#name.txt"), "special content\n") + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const session = await Session.create({}) + const template = "Read @file#name.txt" + const parts = await SessionPrompt.resolvePromptParts(template) + const fileParts = parts.filter((part) => part.type === "file") + + expect(fileParts.length).toBe(1) + expect(fileParts[0].filename).toBe("file#name.txt") + expect(fileParts[0].url).toContain("%23") + + const decodedPath = fileURLToPath(fileParts[0].url) + expect(decodedPath).toBe(path.join(tmp.path, "file#name.txt")) + + const message = await SessionPrompt.prompt({ + sessionID: session.id, + parts, + noReply: true, + }) + const stored = await MessageV2.get({ sessionID: session.id, messageID: message.info.id }) + const textParts = stored.parts.filter((part) => part.type === "text") + const hasContent = textParts.some((part) => part.text.includes("special content")) + expect(hasContent).toBe(true) + + await Session.remove(session.id) + }, + }) + }) +}) + +describe("session.prompt agent variant", () => { + test("applies agent variant only when using agent model", async () => { + const prev = process.env.OPENAI_API_KEY + process.env.OPENAI_API_KEY = "test-openai-key" + + try { + await using tmp = await tmpdir({ + git: true, + config: { + agent: { + build: { + model: "openai/gpt-5.2", + variant: "xhigh", + }, + }, + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const session = await Session.create({}) + + const other = await SessionPrompt.prompt({ + sessionID: session.id, + agent: "build", + model: { providerID: "opencode", modelID: "kimi-k2.5-free" }, + noReply: true, + parts: [{ type: "text", text: "hello" }], + }) + if (other.info.role !== "user") throw new Error("expected user message") + expect(other.info.variant).toBeUndefined() + + const match = await SessionPrompt.prompt({ + sessionID: session.id, + agent: "build", + noReply: true, + parts: [{ type: "text", text: "hello again" }], + }) + if (match.info.role !== "user") throw new Error("expected user message") + expect(match.info.model).toEqual({ providerID: "openai", modelID: "gpt-5.2" }) + expect(match.info.variant).toBe("xhigh") + + const override = await SessionPrompt.prompt({ + sessionID: session.id, + agent: "build", + noReply: true, + variant: "high", + parts: [{ type: "text", text: "hello third" }], + }) + if (override.info.role !== "user") throw new Error("expected user message") + expect(override.info.variant).toBe("high") + + await Session.remove(session.id) + }, + }) + } finally { + if (prev === undefined) delete process.env.OPENAI_API_KEY + else process.env.OPENAI_API_KEY = prev + } + }) +}) diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 063b66ba1f..64c34e3f59 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.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json index ddf0edb0b4..0f71b281d0 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.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "scripts": { @@ -13,15 +13,15 @@ "./client": "./src/client.ts", "./server": "./src/server.ts", "./v2": { - "types": "./dist/src/v2/index.d.ts", + "types": "./dist/v2/index.d.ts", "default": "./src/v2/index.ts" }, "./v2/client": { - "types": "./dist/src/v2/client.d.ts", + "types": "./dist/v2/client.d.ts", "default": "./src/v2/client.ts" }, "./v2/gen/client": { - "types": "./dist/src/v2/gen/client/index.d.ts", + "types": "./dist/v2/gen/client/index.d.ts", "default": "./src/v2/gen/client/index.ts" }, "./v2/server": "./src/v2/server.ts" diff --git a/packages/sdk/js/tsconfig.json b/packages/sdk/js/tsconfig.json index 92ddd54577..3ab5fcb768 100644 --- a/packages/sdk/js/tsconfig.json +++ b/packages/sdk/js/tsconfig.json @@ -7,7 +7,8 @@ "declaration": true, "moduleResolution": "nodenext", "lib": ["es2022", "dom", "dom.iterable"], - "composite": true + "composite": true, + "rootDir": "src" }, "include": ["src"] } diff --git a/packages/slack/package.json b/packages/slack/package.json index b6ffe038dd..2675833f4c 100644 --- a/packages/slack/package.json +++ b/packages/slack/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/slack", - "version": "1.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/ui/package.json b/packages/ui/package.json index 5c58c14fc9..4e70f7a810 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/ui", - "version": "1.2.8", + "version": "1.2.9", "type": "module", "license": "MIT", "exports": { diff --git a/packages/ui/src/components/collapsible.css b/packages/ui/src/components/collapsible.css index c96d5e64bb..bab2c4f926 100644 --- a/packages/ui/src/components/collapsible.css +++ b/packages/ui/src/components/collapsible.css @@ -26,13 +26,16 @@ [data-slot="collapsible-arrow"] { opacity: 0; transition: opacity 0.15s ease; + will-change: opacity; + transform: translateZ(0); } [data-slot="collapsible-arrow-icon"] { display: inline-flex; color: var(--icon-weaker); - transform: rotate(-90deg); + transform: translateZ(0) rotate(-90deg); transition: transform 0.15s ease; + will-change: transform; } &:hover [data-slot="collapsible-arrow"] { @@ -74,7 +77,7 @@ } [data-slot="collapsible-arrow-icon"] { - transform: rotate(0deg); + transform: translateZ(0) rotate(0deg); } } diff --git a/packages/ui/src/components/message-part.css b/packages/ui/src/components/message-part.css index 2542818585..3415c034cf 100644 --- a/packages/ui/src/components/message-part.css +++ b/packages/ui/src/components/message-part.css @@ -179,6 +179,7 @@ [data-component="text-part"] { width: 100%; + margin-top: 24px; [data-slot="text-part-body"] { margin-top: 0; @@ -227,13 +228,18 @@ [data-component="reasoning-part"] { width: 100%; color: var(--text-base); - font-size: var(--font-size-small); - line-height: var(--line-height-large); + line-height: var(--line-height-normal); [data-component="markdown"] { margin-top: 24px; font-style: normal; font-size: inherit; + color: var(--text-weak); + + strong, + b { + color: var(--text-weak); + } p:has(strong) { margin-top: 24px; diff --git a/packages/ui/src/components/session-turn.css b/packages/ui/src/components/session-turn.css index 81fee2a617..bf1258d2e5 100644 --- a/packages/ui/src/components/session-turn.css +++ b/packages/ui/src/components/session-turn.css @@ -129,6 +129,11 @@ gap: 8px; flex-shrink: 0; + [data-slot="collapsible-arrow"] { + margin-left: -6px; + transform: translateY(2px); + } + [data-component="diff-changes"][data-variant="bars"] { transform: translateY(1px); } diff --git a/packages/ui/src/styles/theme.css b/packages/ui/src/styles/theme.css index 6bcc748520..832b43ec74 100644 --- a/packages/ui/src/styles/theme.css +++ b/packages/ui/src/styles/theme.css @@ -117,6 +117,7 @@ --surface-weak: var(--smoke-light-alpha-3); --surface-weaker: var(--smoke-light-alpha-4); --surface-strong: #ffffff; + --surface-stronger-non-alpha: var(--surface-raised-stronger-non-alpha); --surface-raised-stronger-non-alpha: var(--white); --surface-brand-base: var(--yuzu-light-9); --surface-brand-hover: var(--yuzu-light-10); @@ -375,6 +376,7 @@ --surface-weak: var(--smoke-dark-alpha-4); --surface-weaker: var(--smoke-dark-alpha-5); --surface-strong: var(--smoke-dark-alpha-7); + --surface-stronger-non-alpha: var(--surface-raised-stronger-non-alpha); --surface-raised-stronger-non-alpha: var(--smoke-dark-3); --surface-brand-base: var(--yuzu-light-9); --surface-brand-hover: var(--yuzu-light-10); diff --git a/packages/util/package.json b/packages/util/package.json index 82269b1ec5..a1417edd55 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/util", - "version": "1.2.8", + "version": "1.2.9", "private": true, "type": "module", "license": "MIT", diff --git a/packages/web/astro.config.mjs b/packages/web/astro.config.mjs index 3e3d153e68..b14a7ccb8f 100644 --- a/packages/web/astro.config.mjs +++ b/packages/web/astro.config.mjs @@ -178,7 +178,30 @@ export default defineConfig({ "network", "enterprise", "troubleshooting", - "windows-wsl", + { + label: "Windows", + translations: { + en: "Windows", + ar: "Windows", + "bs-BA": "Windows", + "da-DK": "Windows", + "de-DE": "Windows", + "es-ES": "Windows", + "fr-FR": "Windows", + "it-IT": "Windows", + "ja-JP": "Windows", + "ko-KR": "Windows", + "nb-NO": "Windows", + "pl-PL": "Windows", + "pt-BR": "Windows", + "ru-RU": "Windows", + "th-TH": "Windows", + "tr-TR": "Windows", + "zh-CN": "Windows", + "zh-TW": "Windows", + }, + link: "windows-wsl", + }, { label: "Usage", translations: { diff --git a/packages/web/package.json b/packages/web/package.json index b71ac2aabc..ba9ec45ba1 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.2.8", + "version": "1.2.9", "scripts": { "dev": "astro dev", "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev", diff --git a/packages/web/src/content/docs/custom-tools.mdx b/packages/web/src/content/docs/custom-tools.mdx index 80a1923699..4586343f0a 100644 --- a/packages/web/src/content/docs/custom-tools.mdx +++ b/packages/web/src/content/docs/custom-tools.mdx @@ -79,6 +79,32 @@ This creates two tools: `math_add` and `math_multiply`. --- +#### Name collisions with built-in tools + +Custom tools are keyed by tool name. If a custom tool uses the same name as a built-in tool, the custom tool takes precedence. + +For example, this file replaces the built-in `bash` tool: + +```ts title=".opencode/tools/bash.ts" +import { tool } from "@opencode-ai/plugin" + +export default tool({ + description: "Restricted bash wrapper", + args: { + command: tool.schema.string(), + }, + async execute(args) { + return `blocked: ${args.command}` + }, +}) +``` + +:::note +Prefer unique names unless you intentionally want to replace a built-in tool. If you want to disable a built in tool but not override it, use [permissions](/docs/permissions). +::: + +--- + ### Arguments You can use `tool.schema`, which is just [Zod](https://zod.dev), to define argument types. diff --git a/packages/web/src/content/docs/it/providers.mdx b/packages/web/src/content/docs/it/providers.mdx index 11ed9e141f..9b4c07b665 100644 --- a/packages/web/src/content/docs/it/providers.mdx +++ b/packages/web/src/content/docs/it/providers.mdx @@ -135,6 +135,8 @@ Per usare Amazon Bedrock con OpenCode: 2. **Configura l'autenticazione** usando uno dei seguenti metodi: + *** + #### Variabili d'ambiente (Avvio rapido) Imposta una di queste variabili d'ambiente mentre esegui opencode: @@ -157,6 +159,8 @@ Per usare Amazon Bedrock con OpenCode: export AWS_REGION=us-east-1 ``` + *** + #### File di configurazione (Consigliato) Per configurazione specifica del progetto o persistente, usa `opencode.json`: @@ -184,6 +188,8 @@ Per usare Amazon Bedrock con OpenCode: Le opzioni del file di configurazione hanno la precedenza sulle variabili d'ambiente. ::: + *** + #### Avanzato: VPC Endpoints Se stai usando VPC endpoints per Bedrock: @@ -207,12 +213,16 @@ Per usare Amazon Bedrock con OpenCode: L'opzione `endpoint` è un alias per l'opzione generica `baseURL`, usando terminologia specifica AWS. Se vengono specificati sia `endpoint` sia `baseURL`, `endpoint` ha la precedenza. ::: + *** + #### Metodi di autenticazione - **`AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY`**: Crea un utente IAM e genera chiavi di accesso nella Console AWS - **`AWS_PROFILE`**: Usa profili nominati da `~/.aws/credentials`. Configura prima con `aws configure --profile my-profile` o `aws sso login` - **`AWS_BEARER_TOKEN_BEDROCK`**: Genera chiavi API a lungo termine dalla console Amazon Bedrock - **`AWS_WEB_IDENTITY_TOKEN_FILE` / `AWS_ROLE_ARN`**: Per EKS IRSA (IAM Roles for Service Accounts) o altri ambienti Kubernetes con federazione OIDC. Queste variabili d'ambiente vengono iniettate automaticamente da Kubernetes quando usi le annotazioni del service account. + *** + #### Precedenza autenticazione Amazon Bedrock usa la seguente priorità di autenticazione: @@ -230,7 +240,8 @@ Per usare Amazon Bedrock con OpenCode: ``` :::note -Per profili di inferenza personalizzati, usa il nome del modello e del provider nella chiave e imposta la proprietà `id` all'arn. Questo assicura una cache corretta: +Per profili di inferenza personalizzati, usa il nome del modello e del provider nella chiave e imposta la proprietà `id` all'arn. Questo assicura una cache corretta. +::: ```json title="opencode.json" { @@ -248,8 +259,6 @@ Per profili di inferenza personalizzati, usa il nome del modello e del provider } ``` -::: - --- ### Anthropic @@ -1161,6 +1170,8 @@ Per usare Kimi K2 di Moonshot AI: /models ``` +--- + ### MiniMax 1. Vai alla [MiniMax API Console](https://platform.minimax.io/login), crea un account e genera una chiave API. diff --git a/packages/web/src/content/docs/ko/enterprise.mdx b/packages/web/src/content/docs/ko/enterprise.mdx index e0d60f484b..c86431ba95 100644 --- a/packages/web/src/content/docs/ko/enterprise.mdx +++ b/packages/web/src/content/docs/ko/enterprise.mdx @@ -3,7 +3,7 @@ title: 엔터프라이즈 description: 조직에서 OpenCode를 안전하게 사용하는 방법입니다. --- -import config from "../../../config.mjs" +import config from "../../../../config.mjs" export const email = `mailto:${config.email}` OpenCode Enterprise는 코드와 데이터가 조직의 인프라 밖으로 나가지 않도록 보장하려는 조직을 위한 기능입니다. SSO 및 내부 AI gateway와 연동되는 중앙 config를 사용해 이를 구현할 수 있습니다. diff --git a/packages/web/src/content/docs/ko/providers.mdx b/packages/web/src/content/docs/ko/providers.mdx index 488c025371..ea48dbfb0a 100644 --- a/packages/web/src/content/docs/ko/providers.mdx +++ b/packages/web/src/content/docs/ko/providers.mdx @@ -131,6 +131,8 @@ OpenCode로 Amazon Bedrock을 사용하려면: 2. 다음 방법 중 하나를 사용하여 **설정**합니다: +--- + ### 환경 변수 (빠른 시작) OpenCode를 실행하는 동안 다음 환경 변수 중 하나를 설정합니다: @@ -153,6 +155,8 @@ OpenCode를 실행하는 동안 다음 환경 변수 중 하나를 설정합니 export AWS_REGION=us-east-1 ``` +--- + #### 설정 파일 (권장) 프로젝트별 또는 영구 구성을 위해 `opencode.json`을 사용하십시오. @@ -181,6 +185,8 @@ OpenCode를 실행하는 동안 다음 환경 변수 중 하나를 설정합니 구성 파일 옵션은 환경 변수보다 우선 순위가 높습니다. ::: +--- + #### 고급: VPC 엔드포인트 Bedrock의 VPC 엔드포인트를 사용하는 경우: @@ -204,6 +210,8 @@ Bedrock의 VPC 엔드포인트를 사용하는 경우: `endpoint` 옵션은 일반적인 `baseURL` 옵션의 별칭입니다. `endpoint`와 `baseURL` 둘 다 지정된 경우 `endpoint`가 우선합니다. ::: +--- + #### 인증 방법 - **`AWS_ACCESS_KEY_ID`/`AWS_SECRET_ACCESS_KEY`**: IAM 사용자 및 AWS 콘솔에서 액세스 키 생성 @@ -211,6 +219,8 @@ Bedrock의 VPC 엔드포인트를 사용하는 경우: - **`AWS_BEARER_TOKEN_BEDROCK`**: Amazon Bedrock 콘솔에서 임시 API 키 생성 - **`AWS_WEB_IDENTITY_TOKEN_FILE` / `AWS_ROLE_ARN`**: EKS IRSA (서비스 계정용 IAM 역할) 또는 다른 Kubernetes 환경의 OIDC 연동. 이 환경 변수는 서비스 계정을 사용할 때 Kubernetes에 의해 자동으로 주입됩니다. +--- + #### 인증 우선 순위 Amazon Bedrock은 다음과 같은 인증 우선 순위를 사용합니다. @@ -229,7 +239,8 @@ Amazon Bedrock은 다음과 같은 인증 우선 순위를 사용합니다. ``` :::note -사용자 정의 추론 프로필(custom inference profiles)의 경우, 키에 모델과 공급자 이름을 사용하고 `id` 속성에 ARN을 설정하십시오. 이렇게 하면 올바른 캐싱이 보장됩니다: +사용자 정의 추론 프로필(custom inference profiles)의 경우, 키에 모델과 공급자 이름을 사용하고 `id` 속성에 ARN을 설정하십시오. 이렇게 하면 올바른 캐싱이 보장됩니다. +::: ```json title="opencode.json" { @@ -247,8 +258,6 @@ Amazon Bedrock은 다음과 같은 인증 우선 순위를 사용합니다. } ``` -::: - --- #### Anthropic @@ -657,6 +666,8 @@ GitLab Duo는 GitLab의 Anthropic 프록시를 통해 기본 도구 호출 기 **OAuth**를 선택하면 브라우저에서 권한 부여를 요청합니다. +--- + ### 개인 액세스 토큰 사용 1. [GitLab User Settings > Access Tokens](https://gitlab.com/-/user_settings/personal_access_tokens)로 이동 diff --git a/packages/web/src/content/docs/plugins.mdx b/packages/web/src/content/docs/plugins.mdx index 411b827d22..a8be798217 100644 --- a/packages/web/src/content/docs/plugins.mdx +++ b/packages/web/src/content/docs/plugins.mdx @@ -308,6 +308,10 @@ The `tool` helper creates a custom tool that opencode can call. It takes a Zod s Your custom tools will be available to opencode alongside built-in tools. +:::note +If a plugin tool uses the same name as a built-in tool, the plugin tool takes precedence. +::: + --- ### Logging diff --git a/packages/web/src/content/docs/providers.mdx b/packages/web/src/content/docs/providers.mdx index db473ad36b..db3bfeaeeb 100644 --- a/packages/web/src/content/docs/providers.mdx +++ b/packages/web/src/content/docs/providers.mdx @@ -135,6 +135,8 @@ To use Amazon Bedrock with OpenCode: 2. **Configure authentication** using one of the following methods: + *** + #### Environment Variables (Quick Start) Set one of these environment variables while running opencode: @@ -157,6 +159,8 @@ To use Amazon Bedrock with OpenCode: export AWS_REGION=us-east-1 ``` + *** + #### Configuration File (Recommended) For project-specific or persistent configuration, use `opencode.json`: @@ -184,6 +188,8 @@ To use Amazon Bedrock with OpenCode: Configuration file options take precedence over environment variables. ::: + *** + #### Advanced: VPC Endpoints If you're using VPC endpoints for Bedrock: @@ -207,12 +213,16 @@ To use Amazon Bedrock with OpenCode: The `endpoint` option is an alias for the generic `baseURL` option, using AWS-specific terminology. If both `endpoint` and `baseURL` are specified, `endpoint` takes precedence. ::: + *** + #### Authentication Methods - **`AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY`**: Create an IAM user and generate access keys in the AWS Console - **`AWS_PROFILE`**: Use named profiles from `~/.aws/credentials`. First configure with `aws configure --profile my-profile` or `aws sso login` - **`AWS_BEARER_TOKEN_BEDROCK`**: Generate long-term API keys from the Amazon Bedrock console - **`AWS_WEB_IDENTITY_TOKEN_FILE` / `AWS_ROLE_ARN`**: For EKS IRSA (IAM Roles for Service Accounts) or other Kubernetes environments with OIDC federation. These environment variables are automatically injected by Kubernetes when using service account annotations. + *** + #### Authentication Precedence Amazon Bedrock uses the following authentication priority: @@ -230,7 +240,8 @@ To use Amazon Bedrock with OpenCode: ``` :::note -For custom inference profiles, use the model and provider name in the key and set the `id` property to the arn. This ensures correct caching: +For custom inference profiles, use the model and provider name in the key and set the `id` property to the arn. This ensures correct caching. +::: ```json title="opencode.json" { @@ -248,8 +259,6 @@ For custom inference profiles, use the model and provider name in the key and se } ``` -::: - --- ### Anthropic diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json index d66238434a..1cfd625ac0 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.2.8", + "version": "1.2.9", "publisher": "sst-dev", "repository": { "type": "git",