-
setStore("mobileContentRef", el)} class="flex flex-col gap-45 items-start justify-start mt-4">
+
{(message) => (
= {
"darwin-x64-dmg": "opencode-desktop-darwin-x64.dmg",
"windows-x64-nsis": "opencode-desktop-windows-x64.exe",
"linux-x64-deb": "opencode-desktop-linux-amd64.deb",
+ "linux-x64-appimage": "opencode-desktop-linux-amd64.AppImage",
"linux-x64-rpm": "opencode-desktop-linux-x86_64.rpm",
} satisfies Record
diff --git a/packages/console/app/src/routes/download/index.tsx b/packages/console/app/src/routes/download/index.tsx
index 4f4258755..d4de97c68 100644
--- a/packages/console/app/src/routes/download/index.tsx
+++ b/packages/console/app/src/routes/download/index.tsx
@@ -244,6 +244,22 @@ export default function Download() {
Download
+
diff --git a/packages/console/app/src/routes/download/types.ts b/packages/console/app/src/routes/download/types.ts
index adf71880d..916f97022 100644
--- a/packages/console/app/src/routes/download/types.ts
+++ b/packages/console/app/src/routes/download/types.ts
@@ -1 +1,4 @@
-export type DownloadPlatform = `darwin-${"x64" | "aarch64"}-dmg` | "windows-x64-nsis" | `linux-x64-${"deb" | "rpm"}`
+export type DownloadPlatform =
+ | `darwin-${"x64" | "aarch64"}-dmg`
+ | "windows-x64-nsis"
+ | `linux-x64-${"deb" | "rpm" | "appimage"}`
diff --git a/packages/console/app/src/routes/zen/util/dataDumper.ts b/packages/console/app/src/routes/zen/util/dataDumper.ts
index 155cc6c58..b852ca0b5 100644
--- a/packages/console/app/src/routes/zen/util/dataDumper.ts
+++ b/packages/console/app/src/routes/zen/util/dataDumper.ts
@@ -19,17 +19,23 @@ export function createDataDumper(sessionId: string, requestId: string, projectId
if (!data.modelName) return
const timestamp = new Date().toISOString().replace(/[^0-9]/g, "")
+ const year = timestamp.substring(0, 4)
+ const month = timestamp.substring(4, 6)
+ const day = timestamp.substring(6, 8)
+ const hour = timestamp.substring(8, 10)
+ const minute = timestamp.substring(10, 12)
+ const second = timestamp.substring(12, 14)
waitUntil(
- Resource.ZenData.put(
- `data/${data.modelName}/${sessionId}/${requestId}.json`,
+ Resource.ZenDataNew.put(
+ `data/${data.modelName}/${year}/${month}/${day}/${hour}/${minute}/${second}/${requestId}.json`,
JSON.stringify({ timestamp, ...data }),
),
)
waitUntil(
- Resource.ZenData.put(
- `meta/${data.modelName}/${timestamp}/${requestId}.json`,
+ Resource.ZenDataNew.put(
+ `meta/${data.modelName}/${sessionId}/${requestId}.json`,
JSON.stringify({ timestamp, ...metadata }),
),
)
diff --git a/packages/console/core/package.json b/packages/console/core/package.json
index e1971f3ef..6ffedab0a 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.0.186",
+ "version": "1.0.191",
"private": true,
"type": "module",
"dependencies": {
diff --git a/packages/console/core/sst-env.d.ts b/packages/console/core/sst-env.d.ts
index 632ea3fbe..ffa17f276 100644
--- a/packages/console/core/sst-env.d.ts
+++ b/packages/console/core/sst-env.d.ts
@@ -132,6 +132,7 @@ declare module "sst" {
"GatewayKv": cloudflare.KVNamespace
"LogProcessor": cloudflare.Service
"ZenData": cloudflare.R2Bucket
+ "ZenDataNew": cloudflare.R2Bucket
}
}
diff --git a/packages/console/function/package.json b/packages/console/function/package.json
index 8c9daf340..95fc0e474 100644
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-function",
- "version": "1.0.186",
+ "version": "1.0.191",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/console/function/sst-env.d.ts b/packages/console/function/sst-env.d.ts
index 632ea3fbe..ffa17f276 100644
--- a/packages/console/function/sst-env.d.ts
+++ b/packages/console/function/sst-env.d.ts
@@ -132,6 +132,7 @@ declare module "sst" {
"GatewayKv": cloudflare.KVNamespace
"LogProcessor": cloudflare.Service
"ZenData": cloudflare.R2Bucket
+ "ZenDataNew": cloudflare.R2Bucket
}
}
diff --git a/packages/console/mail/package.json b/packages/console/mail/package.json
index 2ce541a3b..ff6b3f102 100644
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-mail",
- "version": "1.0.186",
+ "version": "1.0.191",
"dependencies": {
"@jsx-email/all": "2.2.3",
"@jsx-email/cli": "1.4.3",
diff --git a/packages/console/resource/sst-env.d.ts b/packages/console/resource/sst-env.d.ts
index 632ea3fbe..ffa17f276 100644
--- a/packages/console/resource/sst-env.d.ts
+++ b/packages/console/resource/sst-env.d.ts
@@ -132,6 +132,7 @@ declare module "sst" {
"GatewayKv": cloudflare.KVNamespace
"LogProcessor": cloudflare.Service
"ZenData": cloudflare.R2Bucket
+ "ZenDataNew": cloudflare.R2Bucket
}
}
diff --git a/packages/desktop/.gitignore b/packages/desktop/.gitignore
index 4a20d55a7..a547bf36d 100644
--- a/packages/desktop/.gitignore
+++ b/packages/desktop/.gitignore
@@ -1 +1,24 @@
-src/assets/theme.css
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/packages/desktop/README.md b/packages/desktop/README.md
index 6a1764536..b381dcf5b 100644
--- a/packages/desktop/README.md
+++ b/packages/desktop/README.md
@@ -1,34 +1,7 @@
-## Usage
+# Tauri + Vanilla TS
-Those templates dependencies are maintained via [pnpm](https://pnpm.io) via `pnpm up -Lri`.
+This template should help get you started developing with Tauri in vanilla HTML, CSS and Typescript.
-This is the reason you see a `pnpm-lock.yaml`. That being said, any package manager will work. This file can be safely be removed once you clone a template.
+## Recommended IDE Setup
-```bash
-$ npm install # or pnpm install or yarn install
-```
-
-### Learn more on the [Solid Website](https://solidjs.com) and come chat with us on our [Discord](https://discord.com/invite/solidjs)
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm run dev` or `npm start`
-
-Runs the app in the development mode.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.
-
-### `npm run build`
-
-Builds the app for production to the `dist` folder.
-It correctly bundles Solid in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.
-Your app is ready to be deployed!
-
-## Deployment
-
-You can deploy the `dist` folder to any static host provider (netlify, surge, now, etc.)
+- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)
diff --git a/packages/desktop/index.html b/packages/desktop/index.html
index 9803517a0..faeb1a1fd 100644
--- a/packages/desktop/index.html
+++ b/packages/desktop/index.html
@@ -14,7 +14,7 @@
-
+
-
+
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 5f38ac60d..23eab7f4d 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,62 +1,37 @@
{
"name": "@opencode-ai/desktop",
- "version": "1.0.186",
- "description": "",
+ "private": true,
+ "version": "1.0.191",
"type": "module",
- "exports": {
- ".": "./src/index.ts",
- "./vite": "./vite.js"
- },
"scripts": {
"typecheck": "tsgo -b",
- "start": "vite",
+ "predev": "bun ./scripts/predev.ts",
"dev": "vite",
- "build": "vite build",
- "serve": "vite preview"
- },
- "license": "MIT",
- "devDependencies": {
- "@happy-dom/global-registrator": "20.0.11",
- "@tailwindcss/vite": "catalog:",
- "@tsconfig/bun": "1.0.9",
- "@types/bun": "catalog:",
- "@types/luxon": "catalog:",
- "@types/node": "catalog:",
- "@typescript/native-preview": "catalog:",
- "typescript": "catalog:",
- "vite": "catalog:",
- "vite-plugin-icons-spritesheet": "3.0.1",
- "vite-plugin-solid": "catalog:"
+ "build": "bun run typecheck && vite build",
+ "preview": "vite preview",
+ "tauri": "tauri"
},
"dependencies": {
- "@kobalte/core": "catalog:",
- "@opencode-ai/sdk": "workspace:*",
- "@opencode-ai/ui": "workspace:*",
- "@opencode-ai/util": "workspace:*",
- "@shikijs/transformers": "3.9.2",
- "@solid-primitives/active-element": "2.1.3",
- "@solid-primitives/audio": "1.4.2",
- "@solid-primitives/event-bus": "1.1.2",
- "@solid-primitives/media": "2.3.3",
- "@solid-primitives/resize-observer": "2.1.3",
- "@solid-primitives/scroll": "2.1.3",
+ "@opencode-ai/app": "workspace:*",
"@solid-primitives/storage": "catalog:",
- "@solid-primitives/websocket": "1.3.1",
- "@solidjs/meta": "catalog:",
- "@solidjs/router": "catalog:",
- "@thisbeyond/solid-dnd": "0.7.5",
- "diff": "catalog:",
- "fuzzysort": "catalog:",
- "ghostty-web": "0.3.0",
- "luxon": "catalog:",
- "marked": "16.2.0",
- "marked-shiki": "1.2.1",
- "remeda": "catalog:",
- "shiki": "3.9.2",
- "solid-js": "catalog:",
- "solid-list": "catalog:",
- "tailwindcss": "catalog:",
- "virtua": "catalog:",
- "zod": "catalog:"
+ "@tauri-apps/api": "^2",
+ "@tauri-apps/plugin-dialog": "~2",
+ "@tauri-apps/plugin-opener": "^2",
+ "@tauri-apps/plugin-os": "~2",
+ "@tauri-apps/plugin-process": "~2",
+ "@tauri-apps/plugin-shell": "~2",
+ "@tauri-apps/plugin-store": "~2",
+ "@tauri-apps/plugin-updater": "~2",
+ "@tauri-apps/plugin-http": "~2",
+ "@tauri-apps/plugin-window-state": "~2",
+ "solid-js": "catalog:"
+ },
+ "devDependencies": {
+ "@actions/artifact": "4.0.0",
+ "@tauri-apps/cli": "^2",
+ "@types/bun": "catalog:",
+ "@typescript/native-preview": "catalog:",
+ "typescript": "~5.6.2",
+ "vite": "catalog:"
}
}
diff --git a/packages/tauri/scripts/copy-bundles.ts b/packages/desktop/scripts/copy-bundles.ts
similarity index 100%
rename from packages/tauri/scripts/copy-bundles.ts
rename to packages/desktop/scripts/copy-bundles.ts
diff --git a/packages/tauri/scripts/predev.ts b/packages/desktop/scripts/predev.ts
similarity index 100%
rename from packages/tauri/scripts/predev.ts
rename to packages/desktop/scripts/predev.ts
diff --git a/packages/tauri/scripts/prepare.ts b/packages/desktop/scripts/prepare.ts
similarity index 100%
rename from packages/tauri/scripts/prepare.ts
rename to packages/desktop/scripts/prepare.ts
diff --git a/packages/tauri/scripts/utils.ts b/packages/desktop/scripts/utils.ts
similarity index 100%
rename from packages/tauri/scripts/utils.ts
rename to packages/desktop/scripts/utils.ts
diff --git a/packages/tauri/src-tauri/.gitignore b/packages/desktop/src-tauri/.gitignore
similarity index 100%
rename from packages/tauri/src-tauri/.gitignore
rename to packages/desktop/src-tauri/.gitignore
diff --git a/packages/tauri/src-tauri/Cargo.lock b/packages/desktop/src-tauri/Cargo.lock
similarity index 100%
rename from packages/tauri/src-tauri/Cargo.lock
rename to packages/desktop/src-tauri/Cargo.lock
diff --git a/packages/tauri/src-tauri/Cargo.toml b/packages/desktop/src-tauri/Cargo.toml
similarity index 92%
rename from packages/tauri/src-tauri/Cargo.toml
rename to packages/desktop/src-tauri/Cargo.toml
index c6208190b..0463966c0 100644
--- a/packages/tauri/src-tauri/Cargo.toml
+++ b/packages/desktop/src-tauri/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "opencode-desktop"
version = "0.0.0"
-description = "A Tauri App"
-authors = ["you"]
+description = "The open source AI coding agent"
+authors = ["Anomaly Innovations"]
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/packages/tauri/src-tauri/assets/nsis-header.bmp b/packages/desktop/src-tauri/assets/nsis-header.bmp
similarity index 100%
rename from packages/tauri/src-tauri/assets/nsis-header.bmp
rename to packages/desktop/src-tauri/assets/nsis-header.bmp
diff --git a/packages/tauri/src-tauri/assets/nsis-sidebar.bmp b/packages/desktop/src-tauri/assets/nsis-sidebar.bmp
similarity index 100%
rename from packages/tauri/src-tauri/assets/nsis-sidebar.bmp
rename to packages/desktop/src-tauri/assets/nsis-sidebar.bmp
diff --git a/packages/tauri/src-tauri/build.rs b/packages/desktop/src-tauri/build.rs
similarity index 100%
rename from packages/tauri/src-tauri/build.rs
rename to packages/desktop/src-tauri/build.rs
diff --git a/packages/tauri/src-tauri/capabilities/default.json b/packages/desktop/src-tauri/capabilities/default.json
similarity index 100%
rename from packages/tauri/src-tauri/capabilities/default.json
rename to packages/desktop/src-tauri/capabilities/default.json
diff --git a/packages/tauri/src-tauri/entitlements.plist b/packages/desktop/src-tauri/entitlements.plist
similarity index 100%
rename from packages/tauri/src-tauri/entitlements.plist
rename to packages/desktop/src-tauri/entitlements.plist
diff --git a/packages/tauri/src-tauri/icons/README.md b/packages/desktop/src-tauri/icons/README.md
similarity index 88%
rename from packages/tauri/src-tauri/icons/README.md
rename to packages/desktop/src-tauri/icons/README.md
index d4a4e687d..db86593cc 100644
--- a/packages/tauri/src-tauri/icons/README.md
+++ b/packages/desktop/src-tauri/icons/README.md
@@ -2,7 +2,7 @@
Here's the process I've been using to create icons:
-- Save source image as `app-icon.png` in `packages/tauri`
+- Save source image as `app-icon.png` in `packages/desktop`
- `cd` to `src-tauri`
- Run `bun tauri icons -o icons/{environment}`
- Use [Image2Icon](https://img2icnsapp.com/)'s 'Big Sur Icon' preset to generate an `icon.icns` file and place it in the appropriate icons folder
diff --git a/packages/tauri/src-tauri/icons/dev/128x128.png b/packages/desktop/src-tauri/icons/dev/128x128.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/128x128.png
rename to packages/desktop/src-tauri/icons/dev/128x128.png
diff --git a/packages/tauri/src-tauri/icons/dev/128x128@2x.png b/packages/desktop/src-tauri/icons/dev/128x128@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/128x128@2x.png
rename to packages/desktop/src-tauri/icons/dev/128x128@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/32x32.png b/packages/desktop/src-tauri/icons/dev/32x32.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/32x32.png
rename to packages/desktop/src-tauri/icons/dev/32x32.png
diff --git a/packages/tauri/src-tauri/icons/dev/64x64.png b/packages/desktop/src-tauri/icons/dev/64x64.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/64x64.png
rename to packages/desktop/src-tauri/icons/dev/64x64.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square107x107Logo.png b/packages/desktop/src-tauri/icons/dev/Square107x107Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square107x107Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square107x107Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square142x142Logo.png b/packages/desktop/src-tauri/icons/dev/Square142x142Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square142x142Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square142x142Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square150x150Logo.png b/packages/desktop/src-tauri/icons/dev/Square150x150Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square150x150Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square150x150Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square284x284Logo.png b/packages/desktop/src-tauri/icons/dev/Square284x284Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square284x284Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square284x284Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square30x30Logo.png b/packages/desktop/src-tauri/icons/dev/Square30x30Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square30x30Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square30x30Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square310x310Logo.png b/packages/desktop/src-tauri/icons/dev/Square310x310Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square310x310Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square310x310Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square44x44Logo.png b/packages/desktop/src-tauri/icons/dev/Square44x44Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square44x44Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square44x44Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square71x71Logo.png b/packages/desktop/src-tauri/icons/dev/Square71x71Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square71x71Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square71x71Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/Square89x89Logo.png b/packages/desktop/src-tauri/icons/dev/Square89x89Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/Square89x89Logo.png
rename to packages/desktop/src-tauri/icons/dev/Square89x89Logo.png
diff --git a/packages/tauri/src-tauri/icons/dev/StoreLogo.png b/packages/desktop/src-tauri/icons/dev/StoreLogo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/StoreLogo.png
rename to packages/desktop/src-tauri/icons/dev/StoreLogo.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-anydpi-v26/ic_launcher.xml b/packages/desktop/src-tauri/icons/dev/android/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-anydpi-v26/ic_launcher.xml
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-hdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-mdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/dev/android/values/ic_launcher_background.xml b/packages/desktop/src-tauri/icons/dev/android/values/ic_launcher_background.xml
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/android/values/ic_launcher_background.xml
rename to packages/desktop/src-tauri/icons/dev/android/values/ic_launcher_background.xml
diff --git a/packages/tauri/src-tauri/icons/dev/icon.icns b/packages/desktop/src-tauri/icons/dev/icon.icns
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/icon.icns
rename to packages/desktop/src-tauri/icons/dev/icon.icns
diff --git a/packages/tauri/src-tauri/icons/dev/icon.ico b/packages/desktop/src-tauri/icons/dev/icon.ico
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/icon.ico
rename to packages/desktop/src-tauri/icons/dev/icon.ico
diff --git a/packages/tauri/src-tauri/icons/dev/icon.png b/packages/desktop/src-tauri/icons/dev/icon.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/icon.png
rename to packages/desktop/src-tauri/icons/dev/icon.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@1x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@1x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@1x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@2x-1.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@2x-1.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@3x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-20x20@3x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-20x20@3x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@1x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@1x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@1x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@2x-1.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@2x-1.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@3x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-29x29@3x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-29x29@3x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@1x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@1x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@1x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@2x-1.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@2x-1.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@3x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-40x40@3x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-40x40@3x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-512@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-512@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-512@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-512@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-60x60@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-60x60@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-60x60@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-60x60@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-60x60@3x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-60x60@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-60x60@3x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-60x60@3x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-76x76@1x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-76x76@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-76x76@1x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-76x76@1x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-76x76@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-76x76@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-76x76@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-76x76@2x.png
diff --git a/packages/tauri/src-tauri/icons/dev/ios/AppIcon-83.5x83.5@2x.png b/packages/desktop/src-tauri/icons/dev/ios/AppIcon-83.5x83.5@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/dev/ios/AppIcon-83.5x83.5@2x.png
rename to packages/desktop/src-tauri/icons/dev/ios/AppIcon-83.5x83.5@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/128x128.png b/packages/desktop/src-tauri/icons/prod/128x128.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/128x128.png
rename to packages/desktop/src-tauri/icons/prod/128x128.png
diff --git a/packages/tauri/src-tauri/icons/prod/128x128@2x.png b/packages/desktop/src-tauri/icons/prod/128x128@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/128x128@2x.png
rename to packages/desktop/src-tauri/icons/prod/128x128@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/32x32.png b/packages/desktop/src-tauri/icons/prod/32x32.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/32x32.png
rename to packages/desktop/src-tauri/icons/prod/32x32.png
diff --git a/packages/tauri/src-tauri/icons/prod/64x64.png b/packages/desktop/src-tauri/icons/prod/64x64.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/64x64.png
rename to packages/desktop/src-tauri/icons/prod/64x64.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square107x107Logo.png b/packages/desktop/src-tauri/icons/prod/Square107x107Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square107x107Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square107x107Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square142x142Logo.png b/packages/desktop/src-tauri/icons/prod/Square142x142Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square142x142Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square142x142Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square150x150Logo.png b/packages/desktop/src-tauri/icons/prod/Square150x150Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square150x150Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square150x150Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square284x284Logo.png b/packages/desktop/src-tauri/icons/prod/Square284x284Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square284x284Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square284x284Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square30x30Logo.png b/packages/desktop/src-tauri/icons/prod/Square30x30Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square30x30Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square30x30Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square310x310Logo.png b/packages/desktop/src-tauri/icons/prod/Square310x310Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square310x310Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square310x310Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square44x44Logo.png b/packages/desktop/src-tauri/icons/prod/Square44x44Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square44x44Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square44x44Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square71x71Logo.png b/packages/desktop/src-tauri/icons/prod/Square71x71Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square71x71Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square71x71Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/Square89x89Logo.png b/packages/desktop/src-tauri/icons/prod/Square89x89Logo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/Square89x89Logo.png
rename to packages/desktop/src-tauri/icons/prod/Square89x89Logo.png
diff --git a/packages/tauri/src-tauri/icons/prod/StoreLogo.png b/packages/desktop/src-tauri/icons/prod/StoreLogo.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/StoreLogo.png
rename to packages/desktop/src-tauri/icons/prod/StoreLogo.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-anydpi-v26/ic_launcher.xml b/packages/desktop/src-tauri/icons/prod/android/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-anydpi-v26/ic_launcher.xml
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-hdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-mdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/prod/android/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/packages/tauri/src-tauri/icons/prod/android/values/ic_launcher_background.xml b/packages/desktop/src-tauri/icons/prod/android/values/ic_launcher_background.xml
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/android/values/ic_launcher_background.xml
rename to packages/desktop/src-tauri/icons/prod/android/values/ic_launcher_background.xml
diff --git a/packages/tauri/src-tauri/icons/prod/icon.icns b/packages/desktop/src-tauri/icons/prod/icon.icns
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/icon.icns
rename to packages/desktop/src-tauri/icons/prod/icon.icns
diff --git a/packages/tauri/src-tauri/icons/prod/icon.ico b/packages/desktop/src-tauri/icons/prod/icon.ico
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/icon.ico
rename to packages/desktop/src-tauri/icons/prod/icon.ico
diff --git a/packages/tauri/src-tauri/icons/prod/icon.png b/packages/desktop/src-tauri/icons/prod/icon.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/icon.png
rename to packages/desktop/src-tauri/icons/prod/icon.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@1x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@1x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@1x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@2x-1.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@2x-1.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@3x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-20x20@3x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-20x20@3x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@1x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@1x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@1x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@2x-1.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@2x-1.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@3x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-29x29@3x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-29x29@3x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@1x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@1x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@1x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@2x-1.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@2x-1.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@2x-1.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@2x-1.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@3x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-40x40@3x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-40x40@3x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-512@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-512@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-512@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-512@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-60x60@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-60x60@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-60x60@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-60x60@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-60x60@3x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-60x60@3x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-60x60@3x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-60x60@3x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-76x76@1x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-76x76@1x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-76x76@1x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-76x76@1x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-76x76@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-76x76@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-76x76@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-76x76@2x.png
diff --git a/packages/tauri/src-tauri/icons/prod/ios/AppIcon-83.5x83.5@2x.png b/packages/desktop/src-tauri/icons/prod/ios/AppIcon-83.5x83.5@2x.png
similarity index 100%
rename from packages/tauri/src-tauri/icons/prod/ios/AppIcon-83.5x83.5@2x.png
rename to packages/desktop/src-tauri/icons/prod/ios/AppIcon-83.5x83.5@2x.png
diff --git a/packages/tauri/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs
similarity index 100%
rename from packages/tauri/src-tauri/src/lib.rs
rename to packages/desktop/src-tauri/src/lib.rs
diff --git a/packages/tauri/src-tauri/src/main.rs b/packages/desktop/src-tauri/src/main.rs
similarity index 100%
rename from packages/tauri/src-tauri/src/main.rs
rename to packages/desktop/src-tauri/src/main.rs
diff --git a/packages/tauri/src-tauri/src/window_customizer.rs b/packages/desktop/src-tauri/src/window_customizer.rs
similarity index 100%
rename from packages/tauri/src-tauri/src/window_customizer.rs
rename to packages/desktop/src-tauri/src/window_customizer.rs
diff --git a/packages/tauri/src-tauri/tauri.conf.json b/packages/desktop/src-tauri/tauri.conf.json
similarity index 100%
rename from packages/tauri/src-tauri/tauri.conf.json
rename to packages/desktop/src-tauri/tauri.conf.json
diff --git a/packages/tauri/src-tauri/tauri.prod.conf.json b/packages/desktop/src-tauri/tauri.prod.conf.json
similarity index 100%
rename from packages/tauri/src-tauri/tauri.prod.conf.json
rename to packages/desktop/src-tauri/tauri.prod.conf.json
diff --git a/packages/tauri/src/index.tsx b/packages/desktop/src/index.tsx
similarity index 97%
rename from packages/tauri/src/index.tsx
rename to packages/desktop/src/index.tsx
index dc2c4047d..57c1fbe55 100644
--- a/packages/tauri/src/index.tsx
+++ b/packages/desktop/src/index.tsx
@@ -1,6 +1,6 @@
// @refresh reload
import { render } from "solid-js/web"
-import { App, PlatformProvider, Platform } from "@opencode-ai/desktop"
+import { App, PlatformProvider, Platform } from "@opencode-ai/app"
import { open, save } from "@tauri-apps/plugin-dialog"
import { open as shellOpen } from "@tauri-apps/plugin-shell"
import { type as ostype } from "@tauri-apps/plugin-os"
diff --git a/packages/tauri/src/menu.ts b/packages/desktop/src/menu.ts
similarity index 100%
rename from packages/tauri/src/menu.ts
rename to packages/desktop/src/menu.ts
diff --git a/packages/tauri/src/updater.ts b/packages/desktop/src/updater.ts
similarity index 100%
rename from packages/tauri/src/updater.ts
rename to packages/desktop/src/updater.ts
diff --git a/packages/desktop/tsconfig.json b/packages/desktop/tsconfig.json
index db04f79ca..64a6bc357 100644
--- a/packages/desktop/tsconfig.json
+++ b/packages/desktop/tsconfig.json
@@ -1,7 +1,5 @@
{
- "$schema": "https://json.schemastore.org/tsconfig",
"compilerOptions": {
- "composite": true,
"target": "ESNext",
"module": "ESNext",
"skipLibCheck": true,
@@ -12,13 +10,11 @@
"jsxImportSource": "solid-js",
"allowJs": true,
"strict": true,
- "noEmit": false,
- "emitDeclarationOnly": true,
- "outDir": "node_modules/.ts-dist",
"isolatedModules": true,
- "paths": {
- "@/*": ["./src/*"]
- }
+ "noEmit": true,
+ "emitDeclarationOnly": false,
+ "outDir": "node_modules/.ts-dist"
},
- "exclude": ["dist", "ts-dist"]
+ "references": [{ "path": "../app" }],
+ "include": ["src"]
}
diff --git a/packages/desktop/vite.config.ts b/packages/desktop/vite.config.ts
index 57071a894..123a2028c 100644
--- a/packages/desktop/vite.config.ts
+++ b/packages/desktop/vite.config.ts
@@ -1,15 +1,30 @@
import { defineConfig } from "vite"
-import desktopPlugin from "./vite"
+import appPlugin from "@opencode-ai/app/vite"
+const host = process.env.TAURI_DEV_HOST
+
+// https://vite.dev/config/
export default defineConfig({
- plugins: [desktopPlugin] as any,
+ plugins: [appPlugin],
+ // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
+ //
+ // 1. prevent Vite from obscuring rust errors
+ clearScreen: false,
+ // 2. tauri expects a fixed port, fail if that port is not available
server: {
- host: "0.0.0.0",
- allowedHosts: true,
- port: 3000,
- },
- build: {
- target: "esnext",
- sourcemap: true,
+ port: 1420,
+ strictPort: true,
+ host: host || false,
+ hmr: host
+ ? {
+ protocol: "ws",
+ host,
+ port: 1421,
+ }
+ : undefined,
+ watch: {
+ // 3. tell Vite to ignore watching `src-tauri`
+ ignored: ["**/src-tauri/**"],
+ },
},
})
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index 602788abb..3df50aff2 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/enterprise",
- "version": "1.0.186",
+ "version": "1.0.191",
"private": true,
"type": "module",
"scripts": {
diff --git a/packages/enterprise/src/routes/share/[shareID].tsx b/packages/enterprise/src/routes/share/[shareID].tsx
index a8b2c7f24..471104d79 100644
--- a/packages/enterprise/src/routes/share/[shareID].tsx
+++ b/packages/enterprise/src/routes/share/[shareID].tsx
@@ -212,6 +212,7 @@ export default function () {
{iife(() => {
const [store, setStore] = createStore({
messageId: undefined as string | undefined,
+ expandedSteps: {} as Record
,
})
const messages = createMemo(() =>
data().sessionID
@@ -253,20 +254,22 @@ export default function () {
const title = () => (
-
-
+
+
-
-
-
{model()?.name ?? modelID()}
-
-
- {DateTime.fromMillis(info().time.created).toFormat("dd MMM yyyy, HH:mm")}
+
+
+
+
{model()?.name ?? modelID()}
+
+
+ {DateTime.fromMillis(info().time.created).toFormat("dd MMM yyyy, HH:mm")}
+
{info().title}
@@ -282,6 +285,8 @@ export default function () {
setStore("expandedSteps", message.id, (v) => !v)}
classes={{
root: "min-w-0 w-full relative",
content:
@@ -359,6 +364,13 @@ export default function () {
{
+ const id = store.messageId ?? firstUserMessage()!.id!
+ setStore("expandedSteps", id, (v) => !v)
+ }}
classes={{
root: "grow",
content: "flex flex-col justify-between",
diff --git a/packages/enterprise/sst-env.d.ts b/packages/enterprise/sst-env.d.ts
index 632ea3fbe..ffa17f276 100644
--- a/packages/enterprise/sst-env.d.ts
+++ b/packages/enterprise/sst-env.d.ts
@@ -132,6 +132,7 @@ declare module "sst" {
"GatewayKv": cloudflare.KVNamespace
"LogProcessor": cloudflare.Service
"ZenData": cloudflare.R2Bucket
+ "ZenDataNew": cloudflare.R2Bucket
}
}
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index 8d0141d7b..7e415b51f 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.0.186"
+version = "1.0.191"
schema_version = 1
authors = ["Anomaly"]
repository = "https://github.com/sst/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
icon = "./icons/opencode.svg"
[agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.186/opencode-darwin-arm64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.191/opencode-darwin-arm64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.186/opencode-darwin-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.191/opencode-darwin-x64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.186/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.191/opencode-linux-arm64.tar.gz"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.186/opencode-linux-x64.tar.gz"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.191/opencode-linux-x64.tar.gz"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.186/opencode-windows-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.191/opencode-windows-x64.zip"
cmd = "./opencode.exe"
args = ["acp"]
diff --git a/packages/function/package.json b/packages/function/package.json
index 593499d28..83de02f9d 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/function",
- "version": "1.0.186",
+ "version": "1.0.191",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/function/sst-env.d.ts b/packages/function/sst-env.d.ts
index 632ea3fbe..ffa17f276 100644
--- a/packages/function/sst-env.d.ts
+++ b/packages/function/sst-env.d.ts
@@ -132,6 +132,7 @@ declare module "sst" {
"GatewayKv": cloudflare.KVNamespace
"LogProcessor": cloudflare.Service
"ZenData": cloudflare.R2Bucket
+ "ZenDataNew": cloudflare.R2Bucket
}
}
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index dfba43513..59307256c 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
- "version": "1.0.186",
+ "version": "1.0.191",
"name": "opencode",
"type": "module",
"private": true,
@@ -55,10 +55,12 @@
"@ai-sdk/google": "2.0.44",
"@ai-sdk/google-vertex": "3.0.81",
"@ai-sdk/mcp": "0.0.8",
+ "@ai-sdk/mistral": "2.0.26",
"@ai-sdk/openai": "2.0.71",
"@ai-sdk/openai-compatible": "1.0.27",
"@ai-sdk/provider": "2.0.0",
"@ai-sdk/provider-utils": "3.0.18",
+ "@ai-sdk/xai": "2.0.42",
"@clack/prompts": "1.0.0-alpha.1",
"@hono/standard-validator": "0.1.5",
"@hono/zod-validator": "catalog:",
@@ -71,8 +73,8 @@
"@opencode-ai/sdk": "workspace:*",
"@opencode-ai/util": "workspace:*",
"@openrouter/ai-sdk-provider": "1.5.2",
- "@opentui/core": "0.1.62",
- "@opentui/solid": "0.1.62",
+ "@opentui/core": "0.1.63",
+ "@opentui/solid": "0.1.63",
"@parcel/watcher": "2.5.1",
"@pierre/diffs": "catalog:",
"@solid-primitives/event-bus": "1.1.2",
diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts
index 90c8594cd..ad665e5d6 100644
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -30,6 +30,7 @@ export namespace Agent {
permission: z.object({
edit: Config.Permission,
bash: z.record(z.string(), Config.Permission),
+ skill: z.record(z.string(), Config.Permission),
webfetch: Config.Permission.optional(),
doom_loop: Config.Permission.optional(),
external_directory: Config.Permission.optional(),
@@ -58,6 +59,9 @@ export namespace Agent {
bash: {
"*": "allow",
},
+ skill: {
+ "*": "allow",
+ },
webfetch: "allow",
doom_loop: "ask",
external_directory: "ask",
@@ -337,6 +341,17 @@ function mergeAgentPermissions(basePermission: any, overridePermission: any): Ag
"*": overridePermission.bash,
}
}
+
+ if (typeof basePermission.skill === "string") {
+ basePermission.skill = {
+ "*": basePermission.skill,
+ }
+ }
+ if (typeof overridePermission.skill === "string") {
+ overridePermission.skill = {
+ "*": overridePermission.skill,
+ }
+ }
const merged = mergeDeep(basePermission ?? {}, overridePermission ?? {}) as any
let mergedBash
if (merged.bash) {
@@ -354,10 +369,27 @@ function mergeAgentPermissions(basePermission: any, overridePermission: any): Ag
}
}
+ let mergedSkill
+ if (merged.skill) {
+ if (typeof merged.skill === "string") {
+ mergedSkill = {
+ "*": merged.skill,
+ }
+ } else if (typeof merged.skill === "object") {
+ mergedSkill = mergeDeep(
+ {
+ "*": "allow",
+ },
+ merged.skill,
+ )
+ }
+ }
+
const result: Agent.Info["permission"] = {
edit: merged.edit ?? "allow",
webfetch: merged.webfetch ?? "allow",
bash: mergedBash ?? { "*": "allow" },
+ skill: mergedSkill ?? { "*": "allow" },
doom_loop: merged.doom_loop,
external_directory: merged.external_directory,
}
diff --git a/packages/opencode/src/agent/prompt/summary.txt b/packages/opencode/src/agent/prompt/summary.txt
index 6c11638db..c9264db18 100644
--- a/packages/opencode/src/agent/prompt/summary.txt
+++ b/packages/opencode/src/agent/prompt/summary.txt
@@ -1,4 +1,10 @@
-Summarize the following conversation into 2 sentences MAX explaining what the
-assistant did and why
-Do not explain the user's input.
-Do not speak in the third person about the assistant.
+Summarize what was done in this conversation. Write like a pull request description.
+
+Rules:
+- 2-3 sentences max
+- Describe the changes made, not the process
+- Do not mention running tests, builds, or other validation steps
+- Do not explain what the user asked for
+- Write in first person (I added..., I fixed...)
+- Never ask questions or add new questions
+- Only exception: if the conversation ends with an unanswered question to the user, preserve that exact question
diff --git a/packages/opencode/src/cli/cmd/debug/index.ts b/packages/opencode/src/cli/cmd/debug/index.ts
index 172987875..3b0aefa28 100644
--- a/packages/opencode/src/cli/cmd/debug/index.ts
+++ b/packages/opencode/src/cli/cmd/debug/index.ts
@@ -6,6 +6,7 @@ import { FileCommand } from "./file"
import { LSPCommand } from "./lsp"
import { RipgrepCommand } from "./ripgrep"
import { ScrapCommand } from "./scrap"
+import { SkillCommand } from "./skill"
import { SnapshotCommand } from "./snapshot"
export const DebugCommand = cmd({
@@ -17,6 +18,7 @@ export const DebugCommand = cmd({
.command(RipgrepCommand)
.command(FileCommand)
.command(ScrapCommand)
+ .command(SkillCommand)
.command(SnapshotCommand)
.command(PathsCommand)
.command({
diff --git a/packages/opencode/src/cli/cmd/debug/skill.ts b/packages/opencode/src/cli/cmd/debug/skill.ts
new file mode 100644
index 000000000..8079b688e
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/debug/skill.ts
@@ -0,0 +1,15 @@
+import { EOL } from "os"
+import { Skill } from "../../../skill"
+import { bootstrap } from "../../bootstrap"
+import { cmd } from "../cmd"
+
+export const SkillCommand = cmd({
+ command: "skill",
+ builder: (yargs) => yargs,
+ async handler() {
+ await bootstrap(process.cwd(), async () => {
+ const skills = await Skill.all()
+ process.stdout.write(JSON.stringify(skills, null, 2) + EOL)
+ })
+ },
+})
diff --git a/packages/opencode/src/cli/cmd/github.ts b/packages/opencode/src/cli/cmd/github.ts
index 7234cb12f..607fc7caf 100644
--- a/packages/opencode/src/cli/cmd/github.ts
+++ b/packages/opencode/src/cli/cmd/github.ts
@@ -7,7 +7,7 @@ import { graphql } from "@octokit/graphql"
import * as core from "@actions/core"
import * as github from "@actions/github"
import type { Context } from "@actions/github/lib/context"
-import type { IssueCommentEvent, PullRequestReviewCommentEvent } from "@octokit/webhooks-types"
+import type { IssueCommentEvent, PullRequestReviewCommentEvent, PullRequestEvent } from "@octokit/webhooks-types"
import { UI } from "../ui"
import { cmd } from "./cmd"
import { ModelsDev } from "../../provider/models"
@@ -127,7 +127,7 @@ type IssueQueryResponse = {
const AGENT_USERNAME = "opencode-agent[bot]"
const AGENT_REACTION = "eyes"
const WORKFLOW_FILE = ".github/workflows/opencode.yml"
-const SUPPORTED_EVENTS = ["issue_comment", "pull_request_review_comment", "schedule"] as const
+const SUPPORTED_EVENTS = ["issue_comment", "pull_request_review_comment", "schedule", "pull_request"] as const
// Parses GitHub remote URLs in various formats:
// - https://github.com/owner/repo.git
@@ -392,6 +392,7 @@ export const GithubRunCommand = cmd({
core.setFailed(`Unsupported event type: ${context.eventName}`)
process.exit(1)
}
+ const isCommentEvent = ["issue_comment", "pull_request_review_comment"].includes(context.eventName)
const isScheduleEvent = context.eventName === "schedule"
const { providerID, modelID } = normalizeModel()
@@ -400,17 +401,17 @@ export const GithubRunCommand = cmd({
const oidcBaseUrl = normalizeOidcBaseUrl()
const { owner, repo } = context.repo
// For schedule events, payload has no issue/comment data
- const payload = isScheduleEvent
- ? undefined
- : (context.payload as IssueCommentEvent | PullRequestReviewCommentEvent)
+ const payload = isCommentEvent
+ ? (context.payload as IssueCommentEvent | PullRequestReviewCommentEvent)
+ : undefined
const issueEvent = payload && isIssueCommentEvent(payload) ? payload : undefined
const actor = isScheduleEvent ? undefined : context.actor
const issueId = isScheduleEvent
? undefined
- : context.eventName === "pull_request_review_comment"
- ? (payload as PullRequestReviewCommentEvent).pull_request.number
- : (payload as IssueCommentEvent).issue.number
+ : context.eventName === "issue_comment"
+ ? (payload as IssueCommentEvent).issue.number
+ : (payload as PullRequestEvent | PullRequestReviewCommentEvent).pull_request.number
const runUrl = `/${owner}/${repo}/actions/runs/${runId}`
const shareBaseUrl = isMock ? "https://dev.opencode.ai" : "https://opencode.ai"
@@ -424,11 +425,11 @@ export const GithubRunCommand = cmd({
type PromptFiles = Awaited>["promptFiles"]
const triggerCommentId = payload?.comment.id
const useGithubToken = normalizeUseGithubToken()
- const commentType = isScheduleEvent
- ? undefined
- : context.eventName === "pull_request_review_comment"
+ const commentType = isCommentEvent
+ ? context.eventName === "pull_request_review_comment"
? "pr_review"
: "issue"
+ : undefined
try {
if (useGithubToken) {
@@ -455,7 +456,7 @@ export const GithubRunCommand = cmd({
// Skip permission check for schedule events (no actor to check)
if (!isScheduleEvent) {
await assertPermissions()
- await addReaction(commentType!)
+ await addReaction(commentType)
}
// Setup opencode session
@@ -494,7 +495,10 @@ export const GithubRunCommand = cmd({
} else {
console.log("Response:", response)
}
- } else if (context.eventName === "pull_request_review_comment" || issueEvent?.issue.pull_request) {
+ } else if (
+ ["pull_request", "pull_request_review_comment"].includes(context.eventName) ||
+ issueEvent?.issue.pull_request
+ ) {
const prData = await fetchPR()
// Local PR
if (prData.headRepository.nameWithOwner === prData.baseRepository.nameWithOwner) {
@@ -509,7 +513,7 @@ export const GithubRunCommand = cmd({
}
const hasShared = prData.comments.nodes.some((c) => c.body.includes(`${shareBaseUrl}/s/${shareId}`))
await createComment(`${response}${footer({ image: !hasShared })}`)
- await removeReaction(commentType!)
+ await removeReaction(commentType)
}
// Fork PR
else {
@@ -524,7 +528,7 @@ export const GithubRunCommand = cmd({
}
const hasShared = prData.comments.nodes.some((c) => c.body.includes(`${shareBaseUrl}/s/${shareId}`))
await createComment(`${response}${footer({ image: !hasShared })}`)
- await removeReaction(commentType!)
+ await removeReaction(commentType)
}
}
// Issue
@@ -545,10 +549,10 @@ export const GithubRunCommand = cmd({
`${response}\n\nCloses #${issueId}${footer({ image: true })}`,
)
await createComment(`Created PR #${pr}${footer({ image: true })}`)
- await removeReaction(commentType!)
+ await removeReaction(commentType)
} else {
await createComment(`${response}${footer({ image: true })}`)
- await removeReaction(commentType!)
+ await removeReaction(commentType)
}
}
} catch (e: any) {
@@ -562,7 +566,7 @@ export const GithubRunCommand = cmd({
}
if (!isScheduleEvent) {
await createComment(`${msg}${footer()}`)
- await removeReaction(commentType!)
+ await removeReaction(commentType)
}
core.setFailed(msg)
// Also output the clean error message for the action to capture
@@ -657,6 +661,9 @@ export const GithubRunCommand = cmd({
.map((m) => m.trim().toLowerCase())
.filter(Boolean)
let prompt = (() => {
+ if (!isCommentEvent) {
+ return "Review this pull request"
+ }
const body = payload!.comment.body.trim()
const bodyLower = body.toLowerCase()
if (mentions.some((m) => bodyLower === m)) {
@@ -1030,30 +1037,57 @@ Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
if (!["admin", "write"].includes(permission)) throw new Error(`User ${actor} does not have write permissions`)
}
- async function addReaction(commentType: "issue" | "pr_review") {
+ async function addReaction(commentType?: "issue" | "pr_review") {
// Only called for non-schedule events, so triggerCommentId is defined
console.log("Adding reaction...")
- if (commentType === "pr_review") {
- return await octoRest.rest.reactions.createForPullRequestReviewComment({
+ if (triggerCommentId) {
+ if (commentType === "pr_review") {
+ return await octoRest.rest.reactions.createForPullRequestReviewComment({
+ owner,
+ repo,
+ comment_id: triggerCommentId!,
+ content: AGENT_REACTION,
+ })
+ }
+ return await octoRest.rest.reactions.createForIssueComment({
owner,
repo,
comment_id: triggerCommentId!,
content: AGENT_REACTION,
})
}
- return await octoRest.rest.reactions.createForIssueComment({
+ return await octoRest.rest.reactions.createForIssue({
owner,
repo,
- comment_id: triggerCommentId!,
+ issue_number: issueId!,
content: AGENT_REACTION,
})
}
- async function removeReaction(commentType: "issue" | "pr_review") {
+ async function removeReaction(commentType?: "issue" | "pr_review") {
// Only called for non-schedule events, so triggerCommentId is defined
console.log("Removing reaction...")
- if (commentType === "pr_review") {
- const reactions = await octoRest.rest.reactions.listForPullRequestReviewComment({
+ if (triggerCommentId) {
+ if (commentType === "pr_review") {
+ const reactions = await octoRest.rest.reactions.listForPullRequestReviewComment({
+ owner,
+ repo,
+ comment_id: triggerCommentId!,
+ content: AGENT_REACTION,
+ })
+
+ const eyesReaction = reactions.data.find((r) => r.user?.login === AGENT_USERNAME)
+ if (!eyesReaction) return
+
+ return await octoRest.rest.reactions.deleteForPullRequestComment({
+ owner,
+ repo,
+ comment_id: triggerCommentId!,
+ reaction_id: eyesReaction.id,
+ })
+ }
+
+ const reactions = await octoRest.rest.reactions.listForIssueComment({
owner,
repo,
comment_id: triggerCommentId!,
@@ -1063,29 +1097,28 @@ Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
const eyesReaction = reactions.data.find((r) => r.user?.login === AGENT_USERNAME)
if (!eyesReaction) return
- await octoRest.rest.reactions.deleteForPullRequestComment({
+ return await octoRest.rest.reactions.deleteForIssueComment({
owner,
repo,
comment_id: triggerCommentId!,
reaction_id: eyesReaction.id,
})
- return
}
- const reactions = await octoRest.rest.reactions.listForIssueComment({
+ const reactions = await octoRest.rest.reactions.listForIssue({
owner,
repo,
- comment_id: triggerCommentId!,
+ issue_number: issueId!,
content: AGENT_REACTION,
})
const eyesReaction = reactions.data.find((r) => r.user?.login === AGENT_USERNAME)
if (!eyesReaction) return
- await octoRest.rest.reactions.deleteForIssueComment({
+ await octoRest.rest.reactions.deleteForIssue({
owner,
repo,
- comment_id: triggerCommentId!,
+ issue_number: issueId!,
reaction_id: eyesReaction.id,
})
}
@@ -1178,7 +1211,7 @@ query($owner: String!, $repo: String!, $number: Int!) {
const comments = (issue.comments?.nodes || [])
.filter((c) => {
const id = parseInt(c.databaseId)
- return id !== payload!.comment.id
+ return id !== triggerCommentId
})
.map((c) => ` - ${c.author.login} at ${c.createdAt}: ${c.body}`)
@@ -1306,7 +1339,7 @@ query($owner: String!, $repo: String!, $number: Int!) {
const comments = (pr.comments?.nodes || [])
.filter((c) => {
const id = parseInt(c.databaseId)
- return id !== payload!.comment.id
+ return id !== triggerCommentId
})
.map((c) => `- ${c.author.login} at ${c.createdAt}: ${c.body}`)
diff --git a/packages/opencode/src/cli/cmd/mcp.ts b/packages/opencode/src/cli/cmd/mcp.ts
index 9ca4b3bff..b4ae8a37f 100644
--- a/packages/opencode/src/cli/cmd/mcp.ts
+++ b/packages/opencode/src/cli/cmd/mcp.ts
@@ -1,16 +1,41 @@
import { cmd } from "./cmd"
import { Client } from "@modelcontextprotocol/sdk/client/index.js"
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
+import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"
import * as prompts from "@clack/prompts"
import { UI } from "../ui"
import { MCP } from "../../mcp"
import { McpAuth } from "../../mcp/auth"
+import { McpOAuthProvider } from "../../mcp/oauth-provider"
import { Config } from "../../config/config"
import { Instance } from "../../project/instance"
+import { Installation } from "../../installation"
import path from "path"
-import os from "os"
import { Global } from "../../global"
+function getAuthStatusIcon(status: MCP.AuthStatus): string {
+ switch (status) {
+ case "authenticated":
+ return "✓"
+ case "expired":
+ return "⚠"
+ case "not_authenticated":
+ return "○"
+ }
+}
+
+function getAuthStatusText(status: MCP.AuthStatus): string {
+ switch (status) {
+ case "authenticated":
+ return "authenticated"
+ case "expired":
+ return "expired"
+ case "not_authenticated":
+ return "not authenticated"
+ }
+}
+
export const McpCommand = cmd({
command: "mcp",
builder: (yargs) =>
@@ -19,6 +44,7 @@ export const McpCommand = cmd({
.command(McpListCommand)
.command(McpAuthCommand)
.command(McpLogoutCommand)
+ .command(McpDebugCommand)
.demandCommand(),
async handler() {},
})
@@ -94,10 +120,12 @@ export const McpAuthCommand = cmd({
command: "auth [name]",
describe: "authenticate with an OAuth-enabled MCP server",
builder: (yargs) =>
- yargs.positional("name", {
- describe: "name of the MCP server",
- type: "string",
- }),
+ yargs
+ .positional("name", {
+ describe: "name of the MCP server",
+ type: "string",
+ })
+ .command(McpAuthListCommand),
async handler(args) {
await Instance.provide({
directory: process.cwd(),
@@ -108,20 +136,19 @@ export const McpAuthCommand = cmd({
const config = await Config.get()
const mcpServers = config.mcp ?? {}
- // Get OAuth-enabled servers
- const oauthServers = Object.entries(mcpServers).filter(([_, cfg]) => cfg.type === "remote" && !!cfg.oauth)
+ // Get OAuth-capable servers (remote servers with oauth not explicitly disabled)
+ const oauthServers = Object.entries(mcpServers).filter(
+ ([_, cfg]) => cfg.type === "remote" && cfg.oauth !== false,
+ )
if (oauthServers.length === 0) {
- prompts.log.warn("No OAuth-enabled MCP servers configured")
- prompts.log.info("Add OAuth config to a remote MCP server in opencode.json:")
+ prompts.log.warn("No OAuth-capable MCP servers configured")
+ prompts.log.info("Remote MCP servers support OAuth by default. Add a remote server in opencode.json:")
prompts.log.info(`
"mcp": {
"my-server": {
"type": "remote",
- "url": "https://example.com/mcp",
- "oauth": {
- "scope": "tools:read"
- }
+ "url": "https://example.com/mcp"
}
}`)
prompts.outro("Done")
@@ -130,13 +157,24 @@ export const McpAuthCommand = cmd({
let serverName = args.name
if (!serverName) {
+ // Build options with auth status
+ const options = await Promise.all(
+ oauthServers.map(async ([name, cfg]) => {
+ const authStatus = await MCP.getAuthStatus(name)
+ const icon = getAuthStatusIcon(authStatus)
+ const statusText = getAuthStatusText(authStatus)
+ const url = cfg.type === "remote" ? cfg.url : ""
+ return {
+ label: `${icon} ${name} (${statusText})`,
+ value: name,
+ hint: url,
+ }
+ }),
+ )
+
const selected = await prompts.select({
message: "Select MCP server to authenticate",
- options: oauthServers.map(([name, cfg]) => ({
- label: name,
- value: name,
- hint: cfg.type === "remote" ? cfg.url : undefined,
- })),
+ options,
})
if (prompts.isCancel(selected)) throw new UI.CancelledError()
serverName = selected
@@ -149,22 +187,24 @@ export const McpAuthCommand = cmd({
return
}
- if (serverConfig.type !== "remote" || !serverConfig.oauth) {
- prompts.log.error(`MCP server ${serverName} does not have OAuth configured`)
+ if (serverConfig.type !== "remote" || serverConfig.oauth === false) {
+ prompts.log.error(`MCP server ${serverName} does not support OAuth (oauth is disabled)`)
prompts.outro("Done")
return
}
// Check if already authenticated
- const hasTokens = await MCP.hasStoredTokens(serverName)
- if (hasTokens) {
+ const authStatus = await MCP.getAuthStatus(serverName)
+ if (authStatus === "authenticated") {
const confirm = await prompts.confirm({
- message: `${serverName} already has stored credentials. Re-authenticate?`,
+ message: `${serverName} already has valid credentials. Re-authenticate?`,
})
if (prompts.isCancel(confirm) || !confirm) {
prompts.outro("Cancelled")
return
}
+ } else if (authStatus === "expired") {
+ prompts.log.warn(`${serverName} has expired credentials. Re-authenticating...`)
}
const spinner = prompts.spinner()
@@ -207,6 +247,46 @@ export const McpAuthCommand = cmd({
},
})
+export const McpAuthListCommand = cmd({
+ command: "list",
+ aliases: ["ls"],
+ describe: "list OAuth-capable MCP servers and their auth status",
+ async handler() {
+ await Instance.provide({
+ directory: process.cwd(),
+ async fn() {
+ UI.empty()
+ prompts.intro("MCP OAuth Status")
+
+ const config = await Config.get()
+ const mcpServers = config.mcp ?? {}
+
+ // Get OAuth-capable servers
+ const oauthServers = Object.entries(mcpServers).filter(
+ ([_, cfg]) => cfg.type === "remote" && cfg.oauth !== false,
+ )
+
+ if (oauthServers.length === 0) {
+ prompts.log.warn("No OAuth-capable MCP servers configured")
+ prompts.outro("Done")
+ return
+ }
+
+ for (const [name, serverConfig] of oauthServers) {
+ const authStatus = await MCP.getAuthStatus(name)
+ const icon = getAuthStatusIcon(authStatus)
+ const statusText = getAuthStatusText(authStatus)
+ const url = serverConfig.type === "remote" ? serverConfig.url : ""
+
+ prompts.log.info(`${icon} ${name} ${UI.Style.TEXT_DIM}${statusText}\n ${UI.Style.TEXT_DIM}${url}`)
+ }
+
+ prompts.outro(`${oauthServers.length} OAuth-capable server(s)`)
+ },
+ })
+ },
+})
+
export const McpLogoutCommand = cmd({
command: "logout [name]",
describe: "remove OAuth credentials for an MCP server",
@@ -398,3 +478,177 @@ export const McpAddCommand = cmd({
prompts.outro("MCP server added successfully")
},
})
+
+export const McpDebugCommand = cmd({
+ command: "debug ",
+ describe: "debug OAuth connection for an MCP server",
+ builder: (yargs) =>
+ yargs.positional("name", {
+ describe: "name of the MCP server",
+ type: "string",
+ demandOption: true,
+ }),
+ async handler(args) {
+ await Instance.provide({
+ directory: process.cwd(),
+ async fn() {
+ UI.empty()
+ prompts.intro("MCP OAuth Debug")
+
+ const config = await Config.get()
+ const mcpServers = config.mcp ?? {}
+ const serverName = args.name
+
+ const serverConfig = mcpServers[serverName]
+ if (!serverConfig) {
+ prompts.log.error(`MCP server not found: ${serverName}`)
+ prompts.outro("Done")
+ return
+ }
+
+ if (serverConfig.type !== "remote") {
+ prompts.log.error(`MCP server ${serverName} is not a remote server`)
+ prompts.outro("Done")
+ return
+ }
+
+ if (serverConfig.oauth === false) {
+ prompts.log.warn(`MCP server ${serverName} has OAuth explicitly disabled`)
+ prompts.outro("Done")
+ return
+ }
+
+ prompts.log.info(`Server: ${serverName}`)
+ prompts.log.info(`URL: ${serverConfig.url}`)
+
+ // Check stored auth status
+ const authStatus = await MCP.getAuthStatus(serverName)
+ prompts.log.info(`Auth status: ${getAuthStatusIcon(authStatus)} ${getAuthStatusText(authStatus)}`)
+
+ const entry = await McpAuth.get(serverName)
+ if (entry?.tokens) {
+ prompts.log.info(` Access token: ${entry.tokens.accessToken.substring(0, 20)}...`)
+ if (entry.tokens.expiresAt) {
+ const expiresDate = new Date(entry.tokens.expiresAt * 1000)
+ const isExpired = entry.tokens.expiresAt < Date.now() / 1000
+ prompts.log.info(` Expires: ${expiresDate.toISOString()} ${isExpired ? "(EXPIRED)" : ""}`)
+ }
+ if (entry.tokens.refreshToken) {
+ prompts.log.info(` Refresh token: present`)
+ }
+ }
+ if (entry?.clientInfo) {
+ prompts.log.info(` Client ID: ${entry.clientInfo.clientId}`)
+ if (entry.clientInfo.clientSecretExpiresAt) {
+ const expiresDate = new Date(entry.clientInfo.clientSecretExpiresAt * 1000)
+ prompts.log.info(` Client secret expires: ${expiresDate.toISOString()}`)
+ }
+ }
+
+ const spinner = prompts.spinner()
+ spinner.start("Testing connection...")
+
+ // Test basic HTTP connectivity first
+ try {
+ const response = await fetch(serverConfig.url, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ Accept: "application/json, text/event-stream",
+ },
+ body: JSON.stringify({
+ jsonrpc: "2.0",
+ method: "initialize",
+ params: {
+ protocolVersion: "2024-11-05",
+ capabilities: {},
+ clientInfo: { name: "opencode-debug", version: Installation.VERSION },
+ },
+ id: 1,
+ }),
+ })
+
+ spinner.stop(`HTTP response: ${response.status} ${response.statusText}`)
+
+ // Check for WWW-Authenticate header
+ const wwwAuth = response.headers.get("www-authenticate")
+ if (wwwAuth) {
+ prompts.log.info(`WWW-Authenticate: ${wwwAuth}`)
+ }
+
+ if (response.status === 401) {
+ prompts.log.warn("Server returned 401 Unauthorized")
+
+ // Try to discover OAuth metadata
+ const oauthConfig = typeof serverConfig.oauth === "object" ? serverConfig.oauth : undefined
+ const authProvider = new McpOAuthProvider(
+ serverName,
+ serverConfig.url,
+ {
+ clientId: oauthConfig?.clientId,
+ clientSecret: oauthConfig?.clientSecret,
+ scope: oauthConfig?.scope,
+ },
+ {
+ onRedirect: async () => {},
+ },
+ )
+
+ prompts.log.info("Testing OAuth flow (without completing authorization)...")
+
+ // Try creating transport with auth provider to trigger discovery
+ const transport = new StreamableHTTPClientTransport(new URL(serverConfig.url), {
+ authProvider,
+ })
+
+ try {
+ const client = new Client({
+ name: "opencode-debug",
+ version: Installation.VERSION,
+ })
+ await client.connect(transport)
+ prompts.log.success("Connection successful (already authenticated)")
+ await client.close()
+ } catch (error) {
+ if (error instanceof UnauthorizedError) {
+ prompts.log.info(`OAuth flow triggered: ${error.message}`)
+
+ // Check if dynamic registration would be attempted
+ const clientInfo = await authProvider.clientInformation()
+ if (clientInfo) {
+ prompts.log.info(`Client ID available: ${clientInfo.client_id}`)
+ } else {
+ prompts.log.info("No client ID - dynamic registration will be attempted")
+ }
+ } else {
+ prompts.log.error(`Connection error: ${error instanceof Error ? error.message : String(error)}`)
+ }
+ }
+ } else if (response.status >= 200 && response.status < 300) {
+ prompts.log.success("Server responded successfully (no auth required or already authenticated)")
+ const body = await response.text()
+ try {
+ const json = JSON.parse(body)
+ if (json.result?.serverInfo) {
+ prompts.log.info(`Server info: ${JSON.stringify(json.result.serverInfo)}`)
+ }
+ } catch {
+ // Not JSON, ignore
+ }
+ } else {
+ prompts.log.warn(`Unexpected status: ${response.status}`)
+ const body = await response.text().catch(() => "")
+ if (body) {
+ prompts.log.info(`Response body: ${body.substring(0, 500)}`)
+ }
+ }
+ } catch (error) {
+ spinner.stop("Connection failed", 1)
+ prompts.log.error(`Error: ${error instanceof Error ? error.message : String(error)}`)
+ }
+
+ prompts.outro("Debug complete")
+ },
+ })
+ },
+})
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index a892c83da..47940d0e2 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -14,7 +14,7 @@ import { Keybind } from "@/util/keybind"
import { usePromptHistory, type PromptInfo } from "./history"
import { type AutocompleteRef, Autocomplete } from "./autocomplete"
import { useCommandDialog } from "../dialog-command"
-import { useRenderer } from "@opentui/solid"
+import { useRenderer, useTerminalDimensions } from "@opentui/solid"
import { Editor } from "@tui/util/editor"
import { useExit } from "../../context/exit"
import { Clipboard } from "../../util/clipboard"
@@ -120,6 +120,9 @@ export function Prompt(props: PromptProps) {
const history = usePromptHistory()
const command = useCommandDialog()
const renderer = useRenderer()
+ const dimensions = useTerminalDimensions()
+ const tall = createMemo(() => dimensions().height > 40)
+ const wide = createMemo(() => dimensions().width > 120)
const { theme, syntax } = useTheme()
function promptModelWarning() {
@@ -310,6 +313,11 @@ export function Prompt(props: PromptProps) {
sdk.event.on(TuiEvent.PromptAppend.type, (evt) => {
input.insertText(evt.properties.text)
+ setTimeout(() => {
+ input.getLayoutNode().markDirty()
+ input.gotoBufferEnd()
+ renderer.requestRender()
+ }, 0)
})
createEffect(() => {
@@ -876,19 +884,21 @@ export function Prompt(props: PromptProps) {
cursorColor={theme.text}
syntaxStyle={syntax()}
/>
-
-
- {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
-
-
-
-
- {local.model.parsed().model}
-
- {local.model.parsed().provider}
-
-
-
+
+
+
+ {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
+
+
+
+
+ {local.model.parsed().model}
+
+ {local.model.parsed().provider}
+
+
+
+
- }>
-
-
- {/* @ts-ignore // SpinnerOptions doesn't support marginLeft */}
-
-
- {(() => {
- const retry = createMemo(() => {
- const s = status()
- if (s.type !== "retry") return
- return s
- })
- const message = createMemo(() => {
- const r = retry()
- if (!r) return
- if (r.message.includes("exceeded your current quota") && r.message.includes("gemini"))
- return "gemini is way too hot right now"
- if (r.message.length > 80) return r.message.slice(0, 80) + "..."
- return r.message
- })
- const isTruncated = createMemo(() => {
- const r = retry()
- if (!r) return false
- return r.message.length > 120
- })
- const [seconds, setSeconds] = createSignal(0)
- onMount(() => {
- const timer = setInterval(() => {
- const next = retry()?.next
- if (next) setSeconds(Math.round((next - Date.now()) / 1000))
- }, 1000)
-
- onCleanup(() => {
- clearInterval(timer)
+
+
+
+
+ {/* @ts-ignore // SpinnerOptions doesn't support marginLeft */}
+
+
+ {(() => {
+ const retry = createMemo(() => {
+ const s = status()
+ if (s.type !== "retry") return
+ return s
})
- })
- const handleMessageClick = () => {
- const r = retry()
- if (!r) return
- if (isTruncated()) {
- DialogAlert.show(dialog, "Retry Error", r.message)
+ const message = createMemo(() => {
+ const r = retry()
+ if (!r) return
+ if (r.message.includes("exceeded your current quota") && r.message.includes("gemini"))
+ return "gemini is way too hot right now"
+ if (r.message.length > 80) return r.message.slice(0, 80) + "..."
+ return r.message
+ })
+ const isTruncated = createMemo(() => {
+ const r = retry()
+ if (!r) return false
+ return r.message.length > 120
+ })
+ const [seconds, setSeconds] = createSignal(0)
+ onMount(() => {
+ const timer = setInterval(() => {
+ const next = retry()?.next
+ if (next) setSeconds(Math.round((next - Date.now()) / 1000))
+ }, 1000)
+
+ onCleanup(() => {
+ clearTimeout(timer)
+ })
+ })
+ const handleMessageClick = () => {
+ const r = retry()
+ if (!r) return
+ if (isTruncated()) {
+ DialogAlert.show(dialog, "Retry Error", r.message)
+ }
}
- }
- const retryText = () => {
- const r = retry()
- if (!r) return ""
- const baseMessage = message()
- const truncatedHint = isTruncated() ? " (click to expand)" : ""
- const retryInfo = ` [retrying ${seconds() > 0 ? `in ${seconds()}s ` : ""}attempt #${r.attempt}]`
- return baseMessage + truncatedHint + retryInfo
- }
+ const retryText = () => {
+ const r = retry()
+ if (!r) return ""
+ const baseMessage = message()
+ const truncatedHint = isTruncated() ? " (click to expand)" : ""
+ const retryInfo = ` [retrying ${seconds() > 0 ? `in ${seconds()}s ` : ""}attempt #${r.attempt}]`
+ return baseMessage + truncatedHint + retryInfo
+ }
- return (
-
-
- {retryText()}
-
-
- )
- })()}
+ return (
+
+
+ {retryText()}
+
+
+ )
+ })()}
+
+ 0 ? theme.primary : theme.text}>
+ esc{" "}
+ 0 ? theme.primary : theme.textMuted }}>
+ {store.interrupt > 0 ? "again to interrupt" : "interrupt"}
+
+
- 0 ? theme.primary : theme.text}>
- esc{" "}
- 0 ? theme.primary : theme.textMuted }}>
- {store.interrupt > 0 ? "again to interrupt" : "interrupt"}
-
-
-
-
-
-
-
-
+
+
+
+
+ {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
+
+
+
+
+ {local.model.parsed().model}
+
+ {local.model.parsed().provider}
+
+
+
+
+
+
+
+
+
{keybind.print("agent_cycle")} switch agent
+
+
- {keybind.print("command_list")} commands
+ {keybind.print("sidebar_toggle")} sidebar
-
-
-
- esc exit shell mode
-
-
-
-
-
+
+
+ {keybind.print("command_list")} commands
+
+
+
+
+ esc exit shell mode
+
+
+
+
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
index 86317d62a..ff17b5567 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
@@ -54,7 +54,7 @@ export function DialogMessage(props: {
{
title: "Copy",
value: "message.copy",
- description: "copy message text to clipboard",
+ description: "message text to clipboard",
onSelect: async (dialog) => {
const msg = message()
if (!msg) return
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-subagent.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-subagent.tsx
index a9446b20d..c5ef70ef0 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-subagent.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-subagent.tsx
@@ -11,7 +11,7 @@ export function DialogSubagent(props: { sessionID: string }) {
{
title: "Open",
value: "subagent.view",
- description: "open the subagent's session",
+ description: "the subagent's session",
onSelect: (dialog) => {
route.navigate({
type: "session",
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx
index bfdbfa51b..cf6abef47 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx
@@ -1,121 +1,140 @@
import { type Accessor, createMemo, Match, Show, Switch } from "solid-js"
import { useRouteData } from "@tui/context/route"
import { useSync } from "@tui/context/sync"
-import { pipe, sumBy } from "remeda"
import { useTheme } from "@tui/context/theme"
-import { SplitBorder, EmptyBorder } from "@tui/component/border"
-import type { AssistantMessage, Session } from "@opencode-ai/sdk/v2"
-import { useDirectory } from "../../context/directory"
+import { EmptyBorder } from "@tui/component/border"
+import type { Session } from "@opencode-ai/sdk/v2"
import { useKeybind } from "../../context/keybind"
+import { useTerminalDimensions } from "@opentui/solid"
-const Title = (props: { session: Accessor }) => {
+const Title = (props: { session: Accessor; truncate?: boolean }) => {
const { theme } = useTheme()
return (
-
+
# {props.session().title}
)
}
-const ContextInfo = (props: { context: Accessor; cost: Accessor }) => {
- const { theme } = useTheme()
- return (
-
-
- {props.context()} ({props.cost()})
-
-
- )
-}
-
export function Header() {
const route = useRouteData("session")
const sync = useSync()
const session = createMemo(() => sync.session.get(route.sessionID)!)
- const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
-
- const cost = createMemo(() => {
- const total = pipe(
- messages(),
- sumBy((x) => (x.role === "assistant" ? x.cost : 0)),
- )
- return new Intl.NumberFormat("en-US", {
- style: "currency",
- currency: "USD",
- }).format(total)
- })
-
- const context = createMemo(() => {
- const last = messages().findLast((x) => x.role === "assistant" && x.tokens.output > 0) as AssistantMessage
- if (!last) return
- const total =
- last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
- const model = sync.data.provider.find((x) => x.id === last.providerID)?.models[last.modelID]
- let result = total.toLocaleString()
- if (model?.limit.context) {
- result += " " + Math.round((total / model.limit.context) * 100) + "%"
- }
- return result
- })
+ const showShare = createMemo(() => shareEnabled() && !session()?.share?.url)
const { theme } = useTheme()
const keybind = useKeybind()
+ const dimensions = useTerminalDimensions()
+ const tall = createMemo(() => dimensions().height > 40)
return (
-
-
-
-
- Subagent session
-
-
- Prev {keybind.print("session_child_cycle_reverse")}
-
-
- Next {keybind.print("session_child_cycle")}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {session().share!.url}
-
-
-
-
- /share copy link
-
-
-
-
+
+
+
+
+
+
+
+
+ Subagent session
+
+
+ Parent {keybind.print("session_parent")}
+
+
+ Prev {keybind.print("session_child_cycle_reverse")}
+
+
+ Next {keybind.print("session_child_cycle")}
+
+
+
+
+ /share{" "}
+
+
-
-
-
+
+
+
+
+
+
+ /share{" "}
+
+
+
+
+
+
+
+
+
)
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 95b4d3344..0a357c795 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -22,6 +22,7 @@ import {
ScrollBoxRenderable,
addDefaultParsers,
MacOSScrollAccel,
+ RGBA,
type ScrollAcceleration,
} from "@opentui/core"
import { Prompt, type PromptRef } from "@tui/component/prompt"
@@ -131,13 +132,15 @@ export function Session() {
const [diffWrapMode, setDiffWrapMode] = createSignal<"word" | "none">("word")
const wide = createMemo(() => dimensions().width > 120)
+ const tall = createMemo(() => dimensions().height > 40)
const sidebarVisible = createMemo(() => {
if (session()?.parentID) return false
if (sidebar() === "show") return true
if (sidebar() === "auto" && wide()) return true
return false
})
- const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() ? 42 : 0) - 4)
+ const sidebarOverlay = createMemo(() => sidebarVisible() && !wide())
+ const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() && !sidebarOverlay() ? 42 : 0) - 4)
const scrollAcceleration = createMemo(() => {
const tui = sync.data.config.tui
@@ -234,6 +237,52 @@ export function Session() {
let prompt: PromptRef
const keybind = useKeybind()
+ // Helper: Find next visible message boundary in direction
+ const findNextVisibleMessage = (direction: "next" | "prev"): string | null => {
+ const children = scroll.getChildren()
+ const messagesList = messages()
+ const scrollTop = scroll.y
+
+ // Get visible messages sorted by position, filtering for valid non-synthetic, non-ignored content
+ const visibleMessages = children
+ .filter((c) => {
+ if (!c.id) return false
+ const message = messagesList.find((m) => m.id === c.id)
+ if (!message) return false
+
+ // Check if message has valid non-synthetic, non-ignored text parts
+ const parts = sync.data.part[message.id]
+ if (!parts || !Array.isArray(parts)) return false
+
+ return parts.some((part) => part && part.type === "text" && !part.synthetic && !part.ignored)
+ })
+ .sort((a, b) => a.y - b.y)
+
+ if (visibleMessages.length === 0) return null
+
+ if (direction === "next") {
+ // Find first message below current position
+ return visibleMessages.find((c) => c.y > scrollTop + 10)?.id ?? null
+ }
+ // Find last message above current position
+ return [...visibleMessages].reverse().find((c) => c.y < scrollTop - 10)?.id ?? null
+ }
+
+ // Helper: Scroll to message in direction or fallback to page scroll
+ const scrollToMessage = (direction: "next" | "prev", dialog: ReturnType) => {
+ const targetID = findNextVisibleMessage(direction)
+
+ if (!targetID) {
+ scroll.scrollBy(direction === "next" ? scroll.height : -scroll.height)
+ dialog.clear()
+ return
+ }
+
+ const child = scroll.getChildren().find((c) => c.id === targetID)
+ if (child) scroll.scrollBy(child.y - scroll.y - 1)
+ dialog.clear()
+ }
+
useKeyboard((evt) => {
if (dialog.stack.length > 0) return
@@ -667,6 +716,22 @@ export function Session() {
}
},
},
+ {
+ title: "Next message",
+ value: "session.message.next",
+ keybind: "messages_next",
+ category: "Session",
+ disabled: true,
+ onSelect: (dialog) => scrollToMessage("next", dialog),
+ },
+ {
+ title: "Previous message",
+ value: "session.message.previous",
+ keybind: "messages_previous",
+ category: "Session",
+ disabled: true,
+ onSelect: (dialog) => scrollToMessage("prev", dialog),
+ },
{
title: "Copy last assistant message",
value: "messages.copy",
@@ -841,6 +906,23 @@ export function Session() {
dialog.clear()
},
},
+ {
+ title: "Go to parent session",
+ value: "session.parent",
+ keybind: "session_parent",
+ category: "Session",
+ disabled: true,
+ onSelect: (dialog) => {
+ const parentID = session()?.parentID
+ if (parentID) {
+ navigate({
+ type: "session",
+ sessionID: parentID,
+ })
+ }
+ dialog.clear()
+ },
+ },
])
const revertInfo = createMemo(() => session()?.revert)
@@ -915,7 +997,7 @@ export function Session() {
-
+
-
+
-
+
+
+ setSidebar("hide")}
+ >
+ e.stopPropagation()}>
+
+
+
+
)
@@ -1642,33 +1742,15 @@ ToolRegistry.register({
ToolRegistry.register({
name: "task",
- container: "inline",
+ container: "block",
render(props) {
const { theme } = useTheme()
const keybind = useKeybind()
const dialog = useDialog()
const renderer = useRenderer()
- const [hover, setHover] = createSignal(false)
return (
- setHover(true)}
- onMouseOut={() => setHover(false)}
- onMouseUp={() => {
- const id = props.metadata.sessionId
- if (renderer.getSelection()?.getSelectedText() || !id) return
- dialog.replace(() => )
- }}
- >
+ <>
{Locale.titlecase(props.input.subagent_type ?? "unknown")} Task "{props.input.description}"
@@ -1691,7 +1773,7 @@ ToolRegistry.register({
{keybind.print("session_child_cycle")}, {keybind.print("session_child_cycle_reverse")}
to navigate between subagent sessions
-
+
)
},
})
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
index 6c74e04fa..0bc4e860f 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
@@ -29,6 +29,16 @@ export function Sidebar(props: { sessionID: string }) {
// Sort MCP servers alphabetically for consistent display order
const mcpEntries = createMemo(() => Object.entries(sync.data.mcp).sort(([a], [b]) => a.localeCompare(b)))
+ // Count connected and error MCP servers for collapsed header display
+ const connectedMcpCount = createMemo(() => mcpEntries().filter(([_, item]) => item.status === "connected").length)
+ const errorMcpCount = createMemo(
+ () =>
+ mcpEntries().filter(
+ ([_, item]) =>
+ item.status === "failed" || item.status === "needs_auth" || item.status === "needs_client_registration",
+ ).length,
+ )
+
const cost = createMemo(() => {
const total = messages().reduce((sum, x) => sum + (x.role === "assistant" ? x.cost : 0), 0)
return new Intl.NumberFormat("en-US", {
@@ -62,6 +72,7 @@ export function Sidebar(props: { sessionID: string }) {
MCP
+
+
+ {" "}
+ ({connectedMcpCount()} active
+ {errorMcpCount() > 0 ? `, ${errorMcpCount()} error${errorMcpCount() > 1 ? "s" : ""}` : ""})
+
+
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 031bdd31b..cb93c0ebf 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -414,6 +414,7 @@ export namespace Config {
.object({
edit: Permission.optional(),
bash: z.union([Permission, z.record(z.string(), Permission)]).optional(),
+ skill: z.union([Permission, z.record(z.string(), Permission)]).optional(),
webfetch: Permission.optional(),
doom_loop: Permission.optional(),
external_directory: Permission.optional(),
@@ -456,6 +457,8 @@ export namespace Config {
.describe("Scroll messages down by half page"),
messages_first: z.string().optional().default("ctrl+g,home").describe("Navigate to first message"),
messages_last: z.string().optional().default("ctrl+alt+g,end").describe("Navigate to last message"),
+ messages_next: z.string().optional().default("none").describe("Navigate to next message"),
+ messages_previous: z.string().optional().default("none").describe("Navigate to previous message"),
messages_last_user: z.string().optional().default("none").describe("Navigate to last user message"),
messages_copy: z.string().optional().default("y").describe("Copy message"),
messages_undo: z.string().optional().default("u").describe("Undo message"),
@@ -560,6 +563,7 @@ export namespace Config {
history_next: z.string().optional().default("down").describe("Next history item"),
session_child_cycle: z.string().optional().default("right").describe("Next child session"),
session_child_cycle_reverse: z.string().optional().default("left").describe("Previous child session"),
+ session_parent: z.string().optional().default("up").describe("Go to parent session"),
terminal_suspend: z.string().optional().default("ctrl+z").describe("Suspend terminal"),
terminal_title_toggle: z.string().optional().default("none").describe("Toggle terminal title"),
})
@@ -761,6 +765,7 @@ export namespace Config {
.object({
edit: Permission.optional(),
bash: z.union([Permission, z.record(z.string(), Permission)]).optional(),
+ skill: z.union([Permission, z.record(z.string(), Permission)]).optional(),
webfetch: Permission.optional(),
doom_loop: Permission.optional(),
external_directory: Permission.optional(),
diff --git a/packages/opencode/src/file/ripgrep.ts b/packages/opencode/src/file/ripgrep.ts
index 00d9e8c38..22b714b85 100644
--- a/packages/opencode/src/file/ripgrep.ts
+++ b/packages/opencode/src/file/ripgrep.ts
@@ -240,7 +240,8 @@ export namespace Ripgrep {
if (done) break
buffer += decoder.decode(value, { stream: true })
- const lines = buffer.split("\n")
+ // Handle both Unix (\n) and Windows (\r\n) line endings
+ const lines = buffer.split(/\r?\n/)
buffer = lines.pop() || ""
for (const line of lines) {
@@ -379,7 +380,8 @@ export namespace Ripgrep {
return []
}
- const lines = result.text().trim().split("\n").filter(Boolean)
+ // Handle both Unix (\n) and Windows (\r\n) line endings
+ const lines = result.text().trim().split(/\r?\n/).filter(Boolean)
// Parse JSON lines from ripgrep output
return lines
diff --git a/packages/opencode/src/lsp/language.ts b/packages/opencode/src/lsp/language.ts
index 12792c7c2..620944a8e 100644
--- a/packages/opencode/src/lsp/language.ts
+++ b/packages/opencode/src/lsp/language.ts
@@ -111,4 +111,6 @@ export const LANGUAGE_EXTENSIONS: Record = {
".tfvars": "terraform-vars",
".hcl": "hcl",
".nix": "nix",
+ ".typ": "typst",
+ ".typc": "typst",
} as const
diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts
index 9390259a8..b432e5a5d 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -1747,6 +1747,27 @@ export namespace LSPServer {
},
}
+ export const Clojure: Info = {
+ id: "clojure-lsp",
+ extensions: [".clj", ".cljs", ".cljc", ".edn"],
+ root: NearestRoot(["deps.edn", "project.clj", "shadow-cljs.edn", "bb.edn", "build.boot"]),
+ async spawn(root) {
+ let bin = Bun.which("clojure-lsp")
+ if (!bin && process.platform === "win32") {
+ bin = Bun.which("clojure-lsp.exe")
+ }
+ if (!bin) {
+ log.info("clojure-lsp not found, please install clojure-lsp first")
+ return
+ }
+ return {
+ process: spawn(bin, ["listen"], {
+ cwd: root,
+ }),
+ }
+ },
+ }
+
export const Nixd: Info = {
id: "nixd",
extensions: [".nix"],
@@ -1777,4 +1798,98 @@ export namespace LSPServer {
}
},
}
+
+ export const Tinymist: Info = {
+ id: "tinymist",
+ extensions: [".typ", ".typc"],
+ root: NearestRoot(["typst.toml"]),
+ async spawn(root) {
+ let bin = Bun.which("tinymist", {
+ PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
+ })
+
+ if (!bin) {
+ if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return
+ log.info("downloading tinymist from GitHub releases")
+
+ const response = await fetch("https://api.github.com/repos/Myriad-Dreamin/tinymist/releases/latest")
+ if (!response.ok) {
+ log.error("Failed to fetch tinymist release info")
+ return
+ }
+
+ const release = (await response.json()) as {
+ tag_name?: string
+ assets?: { name?: string; browser_download_url?: string }[]
+ }
+
+ const platform = process.platform
+ const arch = process.arch
+
+ const tinymistArch = arch === "arm64" ? "aarch64" : "x86_64"
+ let tinymistPlatform: string
+ let ext: string
+
+ if (platform === "darwin") {
+ tinymistPlatform = "apple-darwin"
+ ext = "tar.gz"
+ } else if (platform === "win32") {
+ tinymistPlatform = "pc-windows-msvc"
+ ext = "zip"
+ } else {
+ tinymistPlatform = "unknown-linux-gnu"
+ ext = "tar.gz"
+ }
+
+ const assetName = `tinymist-${tinymistArch}-${tinymistPlatform}.${ext}`
+
+ const assets = release.assets ?? []
+ const asset = assets.find((a) => a.name === assetName)
+ if (!asset?.browser_download_url) {
+ log.error(`Could not find asset ${assetName} in tinymist release`)
+ return
+ }
+
+ const downloadResponse = await fetch(asset.browser_download_url)
+ if (!downloadResponse.ok) {
+ log.error("Failed to download tinymist")
+ return
+ }
+
+ const tempPath = path.join(Global.Path.bin, assetName)
+ await Bun.file(tempPath).write(downloadResponse)
+
+ if (ext === "zip") {
+ const ok = await Archive.extractZip(tempPath, Global.Path.bin)
+ .then(() => true)
+ .catch((error) => {
+ log.error("Failed to extract tinymist archive", { error })
+ return false
+ })
+ if (!ok) return
+ } else {
+ await $`tar -xzf ${tempPath} --strip-components=1`.cwd(Global.Path.bin).quiet().nothrow()
+ }
+
+ await fs.rm(tempPath, { force: true })
+
+ bin = path.join(Global.Path.bin, "tinymist" + (platform === "win32" ? ".exe" : ""))
+
+ if (!(await Bun.file(bin).exists())) {
+ log.error("Failed to extract tinymist binary")
+ return
+ }
+
+ if (platform !== "win32") {
+ await $`chmod +x ${bin}`.quiet().nothrow()
+ }
+
+ log.info("installed tinymist", { bin })
+ }
+
+ return {
+ process: spawn(bin, { cwd: root }),
+ }
+ },
+ }
}
diff --git a/packages/opencode/src/mcp/auth.ts b/packages/opencode/src/mcp/auth.ts
index 6ebb95698..7f7dbd156 100644
--- a/packages/opencode/src/mcp/auth.ts
+++ b/packages/opencode/src/mcp/auth.ts
@@ -121,4 +121,15 @@ export namespace McpAuth {
await set(mcpName, entry)
}
}
+
+ /**
+ * Check if stored tokens are expired.
+ * Returns null if no tokens exist, false if no expiry or not expired, true if expired.
+ */
+ export async function isTokenExpired(mcpName: string): Promise {
+ const entry = await get(mcpName)
+ if (!entry?.tokens) return null
+ if (!entry.tokens.expiresAt) return false
+ return entry.tokens.expiresAt < Date.now() / 1000
+ }
}
diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts
index 2f8e4ace4..40ee25565 100644
--- a/packages/opencode/src/mcp/index.ts
+++ b/packages/opencode/src/mcp/index.ts
@@ -15,6 +15,8 @@ import { withTimeout } from "@/util/timeout"
import { McpOAuthProvider } from "./oauth-provider"
import { McpOAuthCallback } from "./oauth-callback"
import { McpAuth } from "./auth"
+import { Bus } from "@/bus"
+import { TuiEvent } from "@/cli/cmd/tui/event"
import open from "open"
export namespace MCP {
@@ -251,10 +253,24 @@ export namespace MCP {
status: "needs_client_registration" as const,
error: "Server does not support dynamic client registration. Please provide clientId in config.",
}
+ // Show toast for needs_client_registration
+ Bus.publish(TuiEvent.ToastShow, {
+ title: "MCP Authentication Required",
+ message: `Server "${key}" requires a pre-registered client ID. Add clientId to your config.`,
+ variant: "warning",
+ duration: 8000,
+ }).catch((e) => log.debug("failed to show toast", { error: e }))
} else {
// Store transport for later finishAuth call
pendingOAuthTransports.set(key, transport)
status = { status: "needs_auth" as const }
+ // Show toast for needs_auth
+ Bus.publish(TuiEvent.ToastShow, {
+ title: "MCP Authentication Required",
+ message: `Server "${key}" requires authentication. Run: opencode mcp auth ${key}`,
+ variant: "warning",
+ duration: 8000,
+ }).catch((e) => log.debug("failed to show toast", { error: e }))
}
break
}
@@ -623,4 +639,16 @@ export namespace MCP {
const entry = await McpAuth.get(mcpName)
return !!entry?.tokens
}
+
+ export type AuthStatus = "authenticated" | "expired" | "not_authenticated"
+
+ /**
+ * Get the authentication status for an MCP server.
+ */
+ export async function getAuthStatus(mcpName: string): Promise {
+ const hasTokens = await hasStoredTokens(mcpName)
+ if (!hasTokens) return "not_authenticated"
+ const expired = await McpAuth.isTokenExpired(mcpName)
+ return expired ? "expired" : "authenticated"
+ }
}
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
index b8d4dadbd..b11ca9368 100644
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -25,6 +25,15 @@ import { createOpenAI } from "@ai-sdk/openai"
import { createOpenAICompatible } from "@ai-sdk/openai-compatible"
import { createOpenRouter, type LanguageModelV2 } from "@openrouter/ai-sdk-provider"
import { createOpenaiCompatible as createGitHubCopilotOpenAICompatible } from "./sdk/openai-compatible/src"
+import { createXai } from "@ai-sdk/xai"
+import { createMistral } from "@ai-sdk/mistral"
+import { createGroq } from "@ai-sdk/groq"
+import { createDeepInfra } from "@ai-sdk/deepinfra"
+import { createCerebras } from "@ai-sdk/cerebras"
+import { createCohere } from "@ai-sdk/cohere"
+import { createGateway } from "@ai-sdk/gateway"
+import { createTogetherAI } from "@ai-sdk/togetherai"
+import { createPerplexity } from "@ai-sdk/perplexity"
export namespace Provider {
const log = Log.create({ service: "provider" })
@@ -39,6 +48,15 @@ export namespace Provider {
"@ai-sdk/openai": createOpenAI,
"@ai-sdk/openai-compatible": createOpenAICompatible,
"@openrouter/ai-sdk-provider": createOpenRouter,
+ "@ai-sdk/xai": createXai,
+ "@ai-sdk/mistral": createMistral,
+ "@ai-sdk/groq": createGroq,
+ "@ai-sdk/deepinfra": createDeepInfra,
+ "@ai-sdk/cerebras": createCerebras,
+ "@ai-sdk/cohere": createCohere,
+ "@ai-sdk/gateway": createGateway,
+ "@ai-sdk/togetherai": createTogetherAI,
+ "@ai-sdk/perplexity": createPerplexity,
// @ts-ignore (TODO: kill this code so we dont have to maintain it)
"@ai-sdk/github-copilot": createGitHubCopilotOpenAICompatible,
}
@@ -67,6 +85,8 @@ export namespace Provider {
const env = Env.all()
if (input.env.some((item) => env[item])) return true
if (await Auth.get(input.id)) return true
+ const config = await Config.get()
+ if (config.provider?.["opencode"]?.options?.apiKey) return true
return false
})()
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index 76403a4ed..d86fe9022 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -216,6 +216,7 @@ export namespace ProviderTransform {
if (id.includes("claude")) return undefined
if (id.includes("gemini-3-pro")) return 1.0
if (id.includes("glm-4.6")) return 1.0
+ if (id.includes("glm-4.7")) return 1.0
if (id.includes("minimax-m2")) return 1.0
if (id.includes("kimi-k2")) {
if (id.includes("thinking")) return 1.0
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index 680ee3024..706ca03e0 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -48,6 +48,7 @@ import { upgradeWebSocket, websocket } from "hono/bun"
import { errors } from "./error"
import { Pty } from "@/pty"
import { AskQuestion } from "@/askquestion"
+import { Installation } from "@/installation"
// @ts-ignore This global is needed to prevent ai-sdk from logging warnings to stdout https://github.com/vercel/ai/blob/2dc67e0ef538307f21368db32d5a12345d98831b/packages/ai/src/logger/log-warnings.ts#L85
globalThis.AI_SDK_LOG_WARNINGS = false
@@ -97,6 +98,27 @@ export namespace Server {
}
})
.use(cors())
+ .get(
+ "/global/health",
+ describeRoute({
+ summary: "Get health",
+ description: "Get health information about the OpenCode server.",
+ operationId: "global.health",
+ responses: {
+ 200: {
+ description: "Health information",
+ content: {
+ "application/json": {
+ schema: resolver(z.object({ healthy: z.literal(true), version: z.string() })),
+ },
+ },
+ },
+ },
+ }),
+ async (c) => {
+ return c.json({ healthy: true, version: Installation.VERSION })
+ },
+ )
.get(
"/global/event",
describeRoute({
@@ -2656,10 +2678,10 @@ export namespace Server {
},
)
.all("/*", async (c) => {
- return proxy(`https://desktop.opencode.ai${c.req.path}`, {
+ return proxy(`https://app.opencode.ai${c.req.path}`, {
...c.req,
headers: {
- host: "desktop.opencode.ai",
+ host: "app.opencode.ai",
},
})
}),
diff --git a/packages/opencode/src/session/compaction.ts b/packages/opencode/src/session/compaction.ts
index 3e4c8020d..339ba2f42 100644
--- a/packages/opencode/src/session/compaction.ts
+++ b/packages/opencode/src/session/compaction.ts
@@ -40,6 +40,8 @@ export namespace SessionCompaction {
export const PRUNE_MINIMUM = 20_000
export const PRUNE_PROTECT = 40_000
+ const PRUNE_PROTECTED_TOOLS = ["skill"]
+
// goes backwards through parts until there are 40_000 tokens worth of tool
// calls. then erases output of previous tool calls. idea is to throw away old
// tool calls that are no longer relevant.
@@ -61,6 +63,8 @@ export namespace SessionCompaction {
const part = msg.parts[partIndex]
if (part.type === "tool")
if (part.state.status === "completed") {
+ if (PRUNE_PROTECTED_TOOLS.includes(part.tool)) continue
+
if (part.state.time.compacted) break loop
const estimate = Token.estimate(part.state.output)
total += estimate
@@ -126,12 +130,15 @@ export namespace SessionCompaction {
model,
abort: input.abort,
})
- // Allow plugins to inject context for compaction
+ // Allow plugins to inject context or replace compaction prompt
const compacting = await Plugin.trigger(
"experimental.session.compacting",
{ sessionID: input.sessionID },
- { context: [] },
+ { context: [], prompt: undefined },
)
+ const defaultPrompt =
+ "Provide a detailed prompt for continuing our conversation above. Focus on information that would be helpful for continuing the conversation, including what we did, what we're doing, which files we're working on, and what we're going to do next considering new session will not have access to our conversation."
+ const promptText = compacting.prompt ?? [defaultPrompt, ...compacting.context].join("\n\n")
const result = await processor.process({
user: userMessage,
agent,
@@ -146,10 +153,7 @@ export namespace SessionCompaction {
content: [
{
type: "text",
- text: [
- "Provide a detailed prompt for continuing our conversation above. Focus on information that would be helpful for continuing the conversation, including what we did, what we're doing, which files we're working on, and what we're going to do next considering new session will not have access to our conversation.",
- ...compacting.context,
- ].join("\n\n"),
+ text: promptText,
},
],
},
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 694e22e32..db0467d32 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -534,11 +534,7 @@ export namespace SessionPrompt {
agent,
abort,
sessionID,
- system: [
- ...(await SystemPrompt.environment()),
- ...(await SystemPrompt.skills()),
- ...(await SystemPrompt.custom()),
- ],
+ system: [...(await SystemPrompt.environment()), ...(await SystemPrompt.custom())],
messages: [
...MessageV2.toModelMessage(sessionMessages),
...(isLastStep
@@ -590,7 +586,8 @@ export namespace SessionPrompt {
mergeDeep(await ToolRegistry.enabled(input.agent)),
mergeDeep(input.tools ?? {}),
)
- for (const item of await ToolRegistry.tools(input.model.providerID)) {
+
+ for (const item of await ToolRegistry.tools(input.model.providerID, input.agent)) {
if (item.id === "askquestion" && input.client !== "tui") continue
if (Wildcard.all(item.id, enabledTools) === false) continue
const schema = ProviderTransform.schema(input.model, z.toJSONSchema(item.parameters))
diff --git a/packages/opencode/src/session/system.ts b/packages/opencode/src/session/system.ts
index a9d0586b4..300943881 100644
--- a/packages/opencode/src/session/system.ts
+++ b/packages/opencode/src/session/system.ts
@@ -14,7 +14,6 @@ import PROMPT_POLARIS from "./prompt/polaris.txt"
import PROMPT_BEAST from "./prompt/beast.txt"
import PROMPT_GEMINI from "./prompt/gemini.txt"
import PROMPT_ANTHROPIC_SPOOF from "./prompt/anthropic_spoof.txt"
-import PROMPT_COMPACTION from "./prompt/compaction.txt"
import PROMPT_CODEX from "./prompt/codex.txt"
import type { Provider } from "@/provider/provider"
@@ -118,25 +117,4 @@ export namespace SystemPrompt {
)
return Promise.all(found).then((result) => result.filter(Boolean))
}
-
- export async function skills() {
- const all = await Skill.all()
- if (all.length === 0) return []
-
- const lines = [
- "You have access to skills listed in ``. When a task matches a skill's description, read its SKILL.md file to get detailed instructions.",
- "",
- "",
- ]
- for (const skill of all) {
- lines.push(" ")
- lines.push(` ${skill.name}`)
- lines.push(` ${skill.description}`)
- lines.push(` ${skill.location}`)
- lines.push(" ")
- }
- lines.push("")
-
- return [lines.join("\n")]
- }
}
diff --git a/packages/opencode/src/skill/skill.ts b/packages/opencode/src/skill/skill.ts
index 88182c5de..41df88f8b 100644
--- a/packages/opencode/src/skill/skill.ts
+++ b/packages/opencode/src/skill/skill.ts
@@ -1,7 +1,5 @@
-import path from "path"
import z from "zod"
import { Config } from "../config/config"
-import { Filesystem } from "../util/filesystem"
import { Instance } from "../project/instance"
import { NamedError } from "@opencode-ai/util/error"
import { ConfigMarkdown } from "../config/markdown"
@@ -9,35 +7,12 @@ import { Log } from "../util/log"
export namespace Skill {
const log = Log.create({ service: "skill" })
-
- // Name: 1-64 chars, lowercase alphanumeric and hyphens, no consecutive hyphens, can't start/end with hyphen
- const NAME_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/
-
- export const Frontmatter = z.object({
- name: z
- .string()
- .min(1)
- .max(64)
- .refine((val) => NAME_REGEX.test(val), {
- message:
- "Name must be lowercase alphanumeric with hyphens, no consecutive hyphens, cannot start or end with hyphen",
- }),
- description: z.string().min(1).max(1024),
- license: z.string().optional(),
- compatibility: z.string().max(500).optional(),
- metadata: z.record(z.string(), z.string()).optional(),
+ export const Info = z.object({
+ name: z.string(),
+ description: z.string(),
+ location: z.string(),
})
-
- export type Frontmatter = z.infer
-
- export interface Info {
- name: string
- description: string
- location: string
- license?: string
- compatibility?: string
- metadata?: Record
- }
+ export type Info = z.infer
export const InvalidError = NamedError.create(
"SkillInvalidError",
@@ -57,15 +32,12 @@ export namespace Skill {
}),
)
- const SKILL_GLOB = new Bun.Glob("skill/*/SKILL.md")
- const CLAUDE_SKILL_GLOB = new Bun.Glob("*/SKILL.md")
+ const SKILL_GLOB = new Bun.Glob("skill/**/SKILL.md")
- async function discover(): Promise {
+ export const state = Instance.state(async () => {
const directories = await Config.directories()
+ const skills: Record = {}
- const paths: string[] = []
-
- // Scan skill/ subdirectory in config directories (.opencode/, ~/.opencode/, etc.)
for (const dir of directories) {
for await (const match of SKILL_GLOB.scan({
cwd: dir,
@@ -73,82 +45,39 @@ export namespace Skill {
onlyFiles: true,
followSymlinks: true,
})) {
- paths.push(match)
+ const md = await ConfigMarkdown.parse(match)
+ if (!md) {
+ continue
+ }
+
+ const parsed = Info.pick({ name: true, description: true }).safeParse(md.data)
+ if (!parsed.success) continue
+
+ // Warn on duplicate skill names
+ if (skills[parsed.data.name]) {
+ log.warn("duplicate skill name", {
+ name: parsed.data.name,
+ existing: skills[parsed.data.name].location,
+ duplicate: match,
+ })
+ }
+
+ skills[parsed.data.name] = {
+ name: parsed.data.name,
+ description: parsed.data.description,
+ location: match,
+ }
}
}
- // Also scan .claude/skills/ walking up from cwd to worktree
- for await (const dir of Filesystem.up({
- targets: [".claude/skills"],
- start: Instance.directory,
- stop: Instance.worktree,
- })) {
- for await (const match of CLAUDE_SKILL_GLOB.scan({
- cwd: dir,
- absolute: true,
- onlyFiles: true,
- followSymlinks: true,
- })) {
- paths.push(match)
- }
- }
-
- return paths
- }
-
- async function load(skillMdPath: string): Promise {
- const md = await ConfigMarkdown.parse(skillMdPath)
- if (!md.data) {
- throw new InvalidError({
- path: skillMdPath,
- message: "SKILL.md must have YAML frontmatter",
- })
- }
-
- const parsed = Frontmatter.safeParse(md.data)
- if (!parsed.success) {
- throw new InvalidError({
- path: skillMdPath,
- issues: parsed.error.issues,
- })
- }
-
- const frontmatter = parsed.data
- const skillDir = path.dirname(skillMdPath)
- const dirName = path.basename(skillDir)
-
- if (frontmatter.name !== dirName) {
- throw new NameMismatchError({
- path: skillMdPath,
- expected: dirName,
- actual: frontmatter.name,
- })
- }
-
- return {
- name: frontmatter.name,
- description: frontmatter.description,
- location: skillMdPath,
- license: frontmatter.license,
- compatibility: frontmatter.compatibility,
- metadata: frontmatter.metadata,
- }
- }
-
- export const state = Instance.state(async () => {
- const paths = await discover()
- const skills: Info[] = []
-
- for (const skillPath of paths) {
- const info = await load(skillPath)
- log.info("loaded skill", { name: info.name, location: info.location })
- skills.push(info)
- }
-
return skills
})
- export async function all(): Promise {
- return state()
+ export async function get(name: string) {
+ return state().then((x) => x[name])
+ }
+
+ export async function all() {
+ return state().then((x) => Object.values(x))
}
}
diff --git a/packages/opencode/src/tool/grep.ts b/packages/opencode/src/tool/grep.ts
index 99af448ba..d73bc1616 100644
--- a/packages/opencode/src/tool/grep.ts
+++ b/packages/opencode/src/tool/grep.ts
@@ -49,7 +49,8 @@ export const GrepTool = Tool.define("grep", {
throw new Error(`ripgrep failed: ${errorOutput}`)
}
- const lines = output.trim().split("\n")
+ // Handle both Unix (\n) and Windows (\r\n) line endings
+ const lines = output.trim().split(/\r?\n/)
const matches = []
for (const line of lines) {
diff --git a/packages/opencode/src/tool/read.ts b/packages/opencode/src/tool/read.ts
index 27426ad24..fd81c4864 100644
--- a/packages/opencode/src/tool/read.ts
+++ b/packages/opencode/src/tool/read.ts
@@ -60,10 +60,12 @@ export const ReadTool = Tool.define("read", {
}
const block = iife(() => {
- const whitelist = [".env.sample", ".example"]
+ const basename = path.basename(filepath)
+ const whitelist = [".env.sample", ".env.example", ".example", ".env.template"]
- if (whitelist.some((w) => filepath.endsWith(w))) return false
- if (filepath.includes(".env")) return true
+ if (whitelist.some((w) => basename.endsWith(w))) return false
+ // Block .env, .env.local, .env.production, etc. but not .envrc
+ if (/^\.env(\.|$)/.test(basename)) return true
return false
})
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 0b1bd3e71..3dad4d0a4 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -11,6 +11,7 @@ import { WebFetchTool } from "./webfetch"
import { WriteTool } from "./write"
import { InvalidTool } from "./invalid"
import { AskQuestionTool } from "./askquestion"
+import { SkillTool } from "./skill"
import type { Agent } from "../agent/agent"
import { Tool } from "./tool"
import { Instance } from "../project/instance"
@@ -105,6 +106,7 @@ export namespace ToolRegistry {
WebSearchTool,
CodeSearchTool,
AskQuestionTool,
+ SkillTool,
...(Flag.OPENCODE_EXPERIMENTAL_LSP_TOOL ? [LspTool] : []),
...(config.experimental?.batch_tool === true ? [BatchTool] : []),
...custom,
@@ -115,7 +117,7 @@ export namespace ToolRegistry {
return all().then((x) => x.map((t) => t.id))
}
- export async function tools(providerID: string) {
+ export async function tools(providerID: string, agent?: Agent.Info) {
const tools = await all()
const result = await Promise.all(
tools
@@ -130,7 +132,7 @@ export namespace ToolRegistry {
using _ = log.time(t.id)
return {
id: t.id,
- ...(await t.init()),
+ ...(await t.init({ agent })),
}
}),
)
@@ -152,6 +154,10 @@ export namespace ToolRegistry {
result["codesearch"] = false
result["websearch"] = false
}
+ // Disable skill tool if all skills are denied
+ if (agent.permission.skill["*"] === "deny" && Object.keys(agent.permission.skill).length === 1) {
+ result["skill"] = false
+ }
return result
}
diff --git a/packages/opencode/src/tool/skill.ts b/packages/opencode/src/tool/skill.ts
new file mode 100644
index 000000000..2503f7639
--- /dev/null
+++ b/packages/opencode/src/tool/skill.ts
@@ -0,0 +1,100 @@
+import path from "path"
+import z from "zod"
+import { Tool } from "./tool"
+import { Skill } from "../skill"
+import { Agent } from "../agent/agent"
+import { Permission } from "../permission"
+import { Wildcard } from "../util/wildcard"
+import { ConfigMarkdown } from "../config/markdown"
+
+const parameters = z.object({
+ name: z.string().describe("The skill identifier from available_skills (e.g., 'code-review')"),
+})
+
+export const SkillTool: Tool.Info = {
+ id: "skill",
+ async init(ctx) {
+ const skills = await Skill.all()
+
+ // Filter skills by agent permissions if agent provided
+ let accessibleSkills = skills
+ if (ctx?.agent) {
+ const permissions = ctx.agent.permission.skill
+ accessibleSkills = skills.filter((skill) => {
+ const action = Wildcard.all(skill.name, permissions)
+ return action !== "deny"
+ })
+ }
+
+ return {
+ description: [
+ "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.",
+ "",
+ ...accessibleSkills.flatMap((skill) => [
+ ` `,
+ ` ${skill.name}`,
+ ` ${skill.description}`,
+ ` `,
+ ]),
+ "",
+ ].join(" "),
+ parameters,
+ async execute(params, ctx) {
+ const agent = await Agent.get(ctx.agent)
+
+ const skill = await Skill.get(params.name)
+
+ if (!skill) {
+ const available = await Skill.all().then((x) => x.map((s) => s.name).join(", "))
+ throw new Error(`Skill "${params.name}" not found. Available skills: ${available || "none"}`)
+ }
+
+ // Check permission using Wildcard.all on the skill name
+ const permissions = agent.permission.skill
+ const action = Wildcard.all(params.name, permissions)
+
+ if (action === "deny") {
+ throw new Permission.RejectedError(
+ ctx.sessionID,
+ "skill",
+ ctx.callID,
+ { skill: params.name },
+ `Access to skill "${params.name}" is denied for agent "${agent.name}".`,
+ )
+ }
+
+ if (action === "ask") {
+ await Permission.ask({
+ type: "skill",
+ pattern: params.name,
+ sessionID: ctx.sessionID,
+ messageID: ctx.messageID,
+ callID: ctx.callID,
+ title: `Load skill: ${skill.name}`,
+ metadata: { name: skill.name, description: skill.description },
+ })
+ }
+
+ // Load and parse skill content
+ const parsed = await ConfigMarkdown.parse(skill.location)
+ const dir = path.dirname(skill.location)
+
+ // Format output similar to plugin pattern
+ const output = [`## Skill: ${skill.name}`, "", `**Base directory**: ${dir}`, "", parsed.content.trim()].join(
+ "\n",
+ )
+
+ return {
+ title: `Loaded skill: ${skill.name}`,
+ output,
+ metadata: {
+ name: skill.name,
+ dir,
+ },
+ }
+ },
+ }
+ },
+}
diff --git a/packages/opencode/src/tool/tool.ts b/packages/opencode/src/tool/tool.ts
index 80b6abe8c..acee24902 100644
--- a/packages/opencode/src/tool/tool.ts
+++ b/packages/opencode/src/tool/tool.ts
@@ -1,11 +1,16 @@
import z from "zod"
import type { MessageV2 } from "../session/message-v2"
+import type { Agent } from "../agent/agent"
export namespace Tool {
interface Metadata {
[key: string]: any
}
+ export interface InitContext {
+ agent?: Agent.Info
+ }
+
export type Context = {
sessionID: string
messageID: string
@@ -17,7 +22,7 @@ export namespace Tool {
}
export interface Info {
id: string
- init: () => Promise<{
+ init: (ctx?: InitContext) => Promise<{
description: string
parameters: Parameters
execute(
@@ -42,8 +47,8 @@ export namespace Tool {
): Info {
return {
id,
- init: async () => {
- const toolInfo = init instanceof Function ? await init() : init
+ init: async (ctx) => {
+ const toolInfo = init instanceof Function ? await init(ctx) : init
const execute = toolInfo.execute
toolInfo.execute = (args, ctx) => {
try {
diff --git a/packages/opencode/test/skill/skill.test.ts b/packages/opencode/test/skill/skill.test.ts
index 3d7bc4c23..4a1d75f9f 100644
--- a/packages/opencode/test/skill/skill.test.ts
+++ b/packages/opencode/test/skill/skill.test.ts
@@ -65,55 +65,7 @@ description: Another test skill.
})
})
-test("throws error for invalid skill name format", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".opencode", "skill", "InvalidName")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: InvalidName
-description: A skill with invalid name.
----
-`,
- )
- },
- })
-
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- await expect(Skill.all()).rejects.toThrow()
- },
- })
-})
-
-test("throws error when name doesn't match directory", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".opencode", "skill", "dir-name")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: different-name
-description: A skill with mismatched name.
----
-`,
- )
- },
- })
-
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- await expect(Skill.all()).rejects.toThrow("SkillNameMismatchError")
- },
- })
-})
-
-test("throws error for missing frontmatter", async () => {
+test("skips skills with missing frontmatter", async () => {
await using tmp = await tmpdir({
git: true,
init: async (dir) => {
@@ -128,78 +80,11 @@ Just some content without YAML frontmatter.
},
})
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- await expect(Skill.all()).rejects.toThrow("SkillInvalidError")
- },
- })
-})
-
-test("parses optional fields", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".opencode", "skill", "full-skill")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: full-skill
-description: A skill with all optional fields.
-license: MIT
-compatibility: Requires Node.js 18+
-metadata:
- author: test-author
- version: "1.0"
----
-
-# Full Skill
-`,
- )
- },
- })
-
await Instance.provide({
directory: tmp.path,
fn: async () => {
const skills = await Skill.all()
- expect(skills.length).toBe(1)
- expect(skills[0].license).toBe("MIT")
- expect(skills[0].compatibility).toBe("Requires Node.js 18+")
- expect(skills[0].metadata).toEqual({
- author: "test-author",
- version: "1.0",
- })
- },
- })
-})
-
-test("ignores unknown frontmatter fields", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".opencode", "skill", "extra-fields")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: extra-fields
-description: A skill with extra unknown fields.
-allowed-tools: Bash Read Write
-some-other-field: ignored
----
-
-# Extra Fields Skill
-`,
- )
- },
- })
-
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const skills = await Skill.all()
- expect(skills.length).toBe(1)
- expect(skills[0].name).toBe("extra-fields")
+ expect(skills).toEqual([])
},
})
})
@@ -216,76 +101,31 @@ test("returns empty array when no skills exist", async () => {
})
})
-test("SystemPrompt.skills() returns empty array when no skills", async () => {
- await using tmp = await tmpdir({ git: true })
+// test("discovers skills from .claude/skills/ directory", async () => {
+// await using tmp = await tmpdir({
+// git: true,
+// init: async (dir) => {
+// const skillDir = path.join(dir, ".claude", "skills", "claude-skill")
+// await Bun.write(
+// path.join(skillDir, "SKILL.md"),
+// `---
+// name: claude-skill
+// description: A skill in the .claude/skills directory.
+// ---
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const result = await SystemPrompt.skills()
- expect(result).toEqual([])
- },
- })
-})
+// # Claude Skill
+// `,
+// )
+// },
+// })
-test("SystemPrompt.skills() returns XML block with skills", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".opencode", "skill", "example-skill")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: example-skill
-description: An example skill for testing XML output.
----
-
-# Example
-`,
- )
- },
- })
-
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const result = await SystemPrompt.skills()
- expect(result.length).toBe(1)
- expect(result[0]).toContain("")
- expect(result[0]).toContain("example-skill")
- expect(result[0]).toContain("An example skill for testing XML output.")
- expect(result[0]).toContain("SKILL.md")
- expect(result[0]).toContain("")
- expect(result[0]).toContain("When a task matches a skill's description")
- },
- })
-})
-
-test("discovers skills from .claude/skills/ directory", async () => {
- await using tmp = await tmpdir({
- git: true,
- init: async (dir) => {
- const skillDir = path.join(dir, ".claude", "skills", "claude-skill")
- await Bun.write(
- path.join(skillDir, "SKILL.md"),
- `---
-name: claude-skill
-description: A skill in the .claude/skills directory.
----
-
-# Claude Skill
-`,
- )
- },
- })
-
- await Instance.provide({
- directory: tmp.path,
- fn: async () => {
- const skills = await Skill.all()
- expect(skills.length).toBe(1)
- expect(skills[0].name).toBe("claude-skill")
- expect(skills[0].location).toContain(".claude/skills/claude-skill/SKILL.md")
- },
- })
-})
+// await Instance.provide({
+// directory: tmp.path,
+// fn: async () => {
+// const skills = await Skill.all()
+// expect(skills.length).toBe(1)
+// expect(skills[0].name).toBe("claude-skill")
+// expect(skills[0].location).toContain(".claude/skills/claude-skill/SKILL.md")
+// },
+// })
+// })
diff --git a/packages/opencode/test/tool/grep.test.ts b/packages/opencode/test/tool/grep.test.ts
new file mode 100644
index 000000000..f3da666a0
--- /dev/null
+++ b/packages/opencode/test/tool/grep.test.ts
@@ -0,0 +1,108 @@
+import { describe, expect, test } from "bun:test"
+import path from "path"
+import { GrepTool } from "../../src/tool/grep"
+import { Instance } from "../../src/project/instance"
+import { tmpdir } from "../fixture/fixture"
+
+const ctx = {
+ sessionID: "test",
+ messageID: "",
+ callID: "",
+ agent: "build",
+ abort: AbortSignal.any([]),
+ metadata: () => {},
+}
+
+const projectRoot = path.join(__dirname, "../..")
+
+describe("tool.grep", () => {
+ test("basic search", async () => {
+ await Instance.provide({
+ directory: projectRoot,
+ fn: async () => {
+ const grep = await GrepTool.init()
+ const result = await grep.execute(
+ {
+ pattern: "export",
+ path: path.join(projectRoot, "src/tool"),
+ include: "*.ts",
+ },
+ ctx,
+ )
+ expect(result.metadata.matches).toBeGreaterThan(0)
+ expect(result.output).toContain("Found")
+ },
+ })
+ })
+
+ test("no matches returns correct output", async () => {
+ await using tmp = await tmpdir({
+ init: async (dir) => {
+ await Bun.write(path.join(dir, "test.txt"), "hello world")
+ },
+ })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const grep = await GrepTool.init()
+ const result = await grep.execute(
+ {
+ pattern: "xyznonexistentpatternxyz123",
+ path: tmp.path,
+ },
+ ctx,
+ )
+ expect(result.metadata.matches).toBe(0)
+ expect(result.output).toBe("No files found")
+ },
+ })
+ })
+
+ test("handles CRLF line endings in output", async () => {
+ // This test verifies the regex split handles both \n and \r\n
+ await using tmp = await tmpdir({
+ init: async (dir) => {
+ // Create a test file with content
+ await Bun.write(path.join(dir, "test.txt"), "line1\nline2\nline3")
+ },
+ })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const grep = await GrepTool.init()
+ const result = await grep.execute(
+ {
+ pattern: "line",
+ path: tmp.path,
+ },
+ ctx,
+ )
+ expect(result.metadata.matches).toBeGreaterThan(0)
+ },
+ })
+ })
+})
+
+describe("CRLF regex handling", () => {
+ test("regex correctly splits Unix line endings", () => {
+ const unixOutput = "file1.txt|1|content1\nfile2.txt|2|content2\nfile3.txt|3|content3"
+ const lines = unixOutput.trim().split(/\r?\n/)
+ expect(lines.length).toBe(3)
+ expect(lines[0]).toBe("file1.txt|1|content1")
+ expect(lines[2]).toBe("file3.txt|3|content3")
+ })
+
+ test("regex correctly splits Windows CRLF line endings", () => {
+ const windowsOutput = "file1.txt|1|content1\r\nfile2.txt|2|content2\r\nfile3.txt|3|content3"
+ const lines = windowsOutput.trim().split(/\r?\n/)
+ expect(lines.length).toBe(3)
+ expect(lines[0]).toBe("file1.txt|1|content1")
+ expect(lines[2]).toBe("file3.txt|3|content3")
+ })
+
+ test("regex handles mixed line endings", () => {
+ const mixedOutput = "file1.txt|1|content1\nfile2.txt|2|content2\r\nfile3.txt|3|content3"
+ const lines = mixedOutput.trim().split(/\r?\n/)
+ expect(lines.length).toBe(3)
+ })
+})
diff --git a/packages/opencode/test/tool/read.test.ts b/packages/opencode/test/tool/read.test.ts
new file mode 100644
index 000000000..47a7aee2a
--- /dev/null
+++ b/packages/opencode/test/tool/read.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, test } from "bun:test"
+import path from "path"
+import { ReadTool } from "../../src/tool/read"
+import { Instance } from "../../src/project/instance"
+import { tmpdir } from "../fixture/fixture"
+
+const ctx = {
+ sessionID: "test",
+ messageID: "",
+ callID: "",
+ agent: "build",
+ abort: AbortSignal.any([]),
+ metadata: () => {},
+}
+
+describe("tool.read env file blocking", () => {
+ test.each([
+ [".env", true],
+ [".env.local", true],
+ [".env.production", true],
+ [".env.sample", false],
+ [".env.example", false],
+ [".envrc", false],
+ ["environment.ts", false],
+ ])("%s blocked=%s", async (filename, blocked) => {
+ await using tmp = await tmpdir({
+ init: (dir) => Bun.write(path.join(dir, filename), "content"),
+ })
+ await Instance.provide({
+ directory: tmp.path,
+ fn: async () => {
+ const read = await ReadTool.init()
+ const promise = read.execute({ filePath: path.join(tmp.path, filename) }, ctx)
+ if (blocked) {
+ await expect(promise).rejects.toThrow("blocked")
+ } else {
+ expect((await promise).output).toContain("content")
+ }
+ },
+ })
+ })
+})
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index fd3fd9f51..babe21271 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/plugin",
- "version": "1.0.186",
+ "version": "1.0.191",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
diff --git a/packages/plugin/src/index.ts b/packages/plugin/src/index.ts
index 487e6ed3e..fbc0e710c 100644
--- a/packages/plugin/src/index.ts
+++ b/packages/plugin/src/index.ts
@@ -192,10 +192,16 @@ export interface Hooks {
},
) => Promise
/**
- * Called before session compaction starts. Allows plugins to append
- * additional context to the compaction prompt.
+ * Called before session compaction starts. Allows plugins to customize
+ * the compaction prompt.
+ *
+ * - `context`: Additional context strings appended to the default prompt
+ * - `prompt`: If set, replaces the default compaction prompt entirely
*/
- "experimental.session.compacting"?: (input: { sessionID: string }, output: { context: string[] }) => Promise
+ "experimental.session.compacting"?: (
+ input: { sessionID: string },
+ output: { context: string[]; prompt?: string },
+ ) => Promise
"experimental.text.complete"?: (
input: { sessionID: string; messageID: string; partID: string },
output: { text: string },
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 1751488b1..6278ebaef 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/sdk",
- "version": "1.0.186",
+ "version": "1.0.191",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
diff --git a/packages/sdk/js/src/gen/types.gen.ts b/packages/sdk/js/src/gen/types.gen.ts
index 964112d81..06993d3f9 100644
--- a/packages/sdk/js/src/gen/types.gen.ts
+++ b/packages/sdk/js/src/gen/types.gen.ts
@@ -858,6 +858,14 @@ export type KeybindsConfig = {
* Navigate to last message
*/
messages_last?: string
+ /**
+ * Navigate to next message
+ */
+ messages_next?: string
+ /**
+ * Navigate to previous message
+ */
+ messages_previous?: string
/**
* Navigate to last user message
*/
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index fa7a86463..97bc92b86 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -30,6 +30,7 @@ import type {
FormatterStatusResponses,
GlobalDisposeResponses,
GlobalEventResponses,
+ GlobalHealthResponses,
InstanceDisposeResponses,
LspStatusResponses,
McpAddErrors,
@@ -188,6 +189,18 @@ class HeyApiRegistry {
}
export class Global extends HeyApiClient {
+ /**
+ * Get health
+ *
+ * Get health information about the OpenCode server.
+ */
+ public health(options?: Options) {
+ return (options?.client ?? this.client).get({
+ url: "/global/health",
+ ...options,
+ })
+ }
+
/**
* Get global events
*
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index f7c0e88a5..1372765e3 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -547,6 +547,48 @@ export type EventSessionCompacted = {
}
}
+export type EventTuiPromptAppend = {
+ type: "tui.prompt.append"
+ properties: {
+ text: string
+ }
+}
+
+export type EventTuiCommandExecute = {
+ type: "tui.command.execute"
+ properties: {
+ command:
+ | "session.list"
+ | "session.new"
+ | "session.share"
+ | "session.interrupt"
+ | "session.compact"
+ | "session.page.up"
+ | "session.page.down"
+ | "session.half.page.up"
+ | "session.half.page.down"
+ | "session.first"
+ | "session.last"
+ | "prompt.clear"
+ | "prompt.submit"
+ | "agent.cycle"
+ | string
+ }
+}
+
+export type EventTuiToastShow = {
+ type: "tui.toast.show"
+ properties: {
+ title?: string
+ message: string
+ variant: "info" | "success" | "warning" | "error"
+ /**
+ * Duration in milliseconds
+ */
+ duration?: number
+ }
+}
+
export type EventCommandExecuted = {
type: "command.executed"
properties: {
@@ -639,48 +681,6 @@ export type EventVcsBranchUpdated = {
}
}
-export type EventTuiPromptAppend = {
- type: "tui.prompt.append"
- properties: {
- text: string
- }
-}
-
-export type EventTuiCommandExecute = {
- type: "tui.command.execute"
- properties: {
- command:
- | "session.list"
- | "session.new"
- | "session.share"
- | "session.interrupt"
- | "session.compact"
- | "session.page.up"
- | "session.page.down"
- | "session.half.page.up"
- | "session.half.page.down"
- | "session.first"
- | "session.last"
- | "prompt.clear"
- | "prompt.submit"
- | "agent.cycle"
- | string
- }
-}
-
-export type EventTuiToastShow = {
- type: "tui.toast.show"
- properties: {
- title?: string
- message: string
- variant: "info" | "success" | "warning" | "error"
- /**
- * Duration in milliseconds
- */
- duration?: number
- }
-}
-
export type Pty = {
id: string
title: string
@@ -752,6 +752,9 @@ export type Event =
| EventSessionStatus
| EventSessionIdle
| EventSessionCompacted
+ | EventTuiPromptAppend
+ | EventTuiCommandExecute
+ | EventTuiToastShow
| EventCommandExecuted
| EventSessionCreated
| EventSessionUpdated
@@ -760,9 +763,6 @@ export type Event =
| EventSessionError
| EventFileWatcherUpdated
| EventVcsBranchUpdated
- | EventTuiPromptAppend
- | EventTuiCommandExecute
- | EventTuiToastShow
| EventPtyCreated
| EventPtyUpdated
| EventPtyExited
@@ -890,6 +890,14 @@ export type KeybindsConfig = {
* Navigate to last message
*/
messages_last?: string
+ /**
+ * Navigate to next message
+ */
+ messages_next?: string
+ /**
+ * Navigate to previous message
+ */
+ messages_previous?: string
/**
* Navigate to last user message
*/
@@ -1114,6 +1122,10 @@ export type KeybindsConfig = {
* Previous child session
*/
session_child_cycle_reverse?: string
+ /**
+ * Go to parent session
+ */
+ session_parent?: string
/**
* Suspend terminal
*/
@@ -1155,6 +1167,13 @@ export type AgentConfig = {
| {
[key: string]: "ask" | "allow" | "deny"
}
+ skill?:
+ | "ask"
+ | "allow"
+ | "deny"
+ | {
+ [key: string]: "ask" | "allow" | "deny"
+ }
webfetch?: "ask" | "allow" | "deny"
doom_loop?: "ask" | "allow" | "deny"
external_directory?: "ask" | "allow" | "deny"
@@ -1181,6 +1200,13 @@ export type AgentConfig = {
| {
[key: string]: "ask" | "allow" | "deny"
}
+ skill?:
+ | "ask"
+ | "allow"
+ | "deny"
+ | {
+ [key: string]: "ask" | "allow" | "deny"
+ }
webfetch?: "ask" | "allow" | "deny"
doom_loop?: "ask" | "allow" | "deny"
external_directory?: "ask" | "allow" | "deny"
@@ -1500,6 +1526,13 @@ export type Config = {
| {
[key: string]: "ask" | "allow" | "deny"
}
+ skill?:
+ | "ask"
+ | "allow"
+ | "deny"
+ | {
+ [key: string]: "ask" | "allow" | "deny"
+ }
webfetch?: "ask" | "allow" | "deny"
doom_loop?: "ask" | "allow" | "deny"
external_directory?: "ask" | "allow" | "deny"
@@ -1780,6 +1813,9 @@ export type Agent = {
bash: {
[key: string]: "ask" | "allow" | "deny"
}
+ skill: {
+ [key: string]: "ask" | "allow" | "deny"
+ }
webfetch?: "ask" | "allow" | "deny"
doom_loop?: "ask" | "allow" | "deny"
external_directory?: "ask" | "allow" | "deny"
@@ -1861,6 +1897,25 @@ export type WellKnownAuth = {
export type Auth = OAuth | ApiAuth | WellKnownAuth
+export type GlobalHealthData = {
+ body?: never
+ path?: never
+ query?: never
+ url: "/global/health"
+}
+
+export type GlobalHealthResponses = {
+ /**
+ * Health information
+ */
+ 200: {
+ healthy: true
+ version: string
+ }
+}
+
+export type GlobalHealthResponse = GlobalHealthResponses[keyof GlobalHealthResponses]
+
export type GlobalEventData = {
body?: never
path?: never
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 12699ee2b..588b130b9 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -6,6 +6,41 @@
"version": "1.0.0"
},
"paths": {
+ "/global/health": {
+ "get": {
+ "operationId": "global.health",
+ "summary": "Get health",
+ "description": "Get health information about the OpenCode server.",
+ "responses": {
+ "200": {
+ "description": "Health information",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "healthy": {
+ "type": "boolean",
+ "const": true
+ },
+ "version": {
+ "type": "string"
+ }
+ },
+ "required": ["healthy", "version"]
+ }
+ }
+ }
+ }
+ },
+ "x-codeSamples": [
+ {
+ "lang": "js",
+ "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.global.health({\n ...\n})"
+ }
+ ]
+ }
+ },
"/global/event": {
"get": {
"operationId": "global.event",
@@ -6499,6 +6534,98 @@
},
"required": ["type", "properties"]
},
+ "Event.tui.prompt.append": {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "const": "tui.prompt.append"
+ },
+ "properties": {
+ "type": "object",
+ "properties": {
+ "text": {
+ "type": "string"
+ }
+ },
+ "required": ["text"]
+ }
+ },
+ "required": ["type", "properties"]
+ },
+ "Event.tui.command.execute": {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "const": "tui.command.execute"
+ },
+ "properties": {
+ "type": "object",
+ "properties": {
+ "command": {
+ "anyOf": [
+ {
+ "type": "string",
+ "enum": [
+ "session.list",
+ "session.new",
+ "session.share",
+ "session.interrupt",
+ "session.compact",
+ "session.page.up",
+ "session.page.down",
+ "session.half.page.up",
+ "session.half.page.down",
+ "session.first",
+ "session.last",
+ "prompt.clear",
+ "prompt.submit",
+ "agent.cycle"
+ ]
+ },
+ {
+ "type": "string"
+ }
+ ]
+ }
+ },
+ "required": ["command"]
+ }
+ },
+ "required": ["type", "properties"]
+ },
+ "Event.tui.toast.show": {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "const": "tui.toast.show"
+ },
+ "properties": {
+ "type": "object",
+ "properties": {
+ "title": {
+ "type": "string"
+ },
+ "message": {
+ "type": "string"
+ },
+ "variant": {
+ "type": "string",
+ "enum": ["info", "success", "warning", "error"]
+ },
+ "duration": {
+ "description": "Duration in milliseconds",
+ "default": 5000,
+ "type": "number"
+ }
+ },
+ "required": ["message", "variant"]
+ }
+ },
+ "required": ["type", "properties"]
+ },
"Event.command.executed": {
"type": "object",
"properties": {
@@ -6793,98 +6920,6 @@
},
"required": ["type", "properties"]
},
- "Event.tui.prompt.append": {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "tui.prompt.append"
- },
- "properties": {
- "type": "object",
- "properties": {
- "text": {
- "type": "string"
- }
- },
- "required": ["text"]
- }
- },
- "required": ["type", "properties"]
- },
- "Event.tui.command.execute": {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "tui.command.execute"
- },
- "properties": {
- "type": "object",
- "properties": {
- "command": {
- "anyOf": [
- {
- "type": "string",
- "enum": [
- "session.list",
- "session.new",
- "session.share",
- "session.interrupt",
- "session.compact",
- "session.page.up",
- "session.page.down",
- "session.half.page.up",
- "session.half.page.down",
- "session.first",
- "session.last",
- "prompt.clear",
- "prompt.submit",
- "agent.cycle"
- ]
- },
- {
- "type": "string"
- }
- ]
- }
- },
- "required": ["command"]
- }
- },
- "required": ["type", "properties"]
- },
- "Event.tui.toast.show": {
- "type": "object",
- "properties": {
- "type": {
- "type": "string",
- "const": "tui.toast.show"
- },
- "properties": {
- "type": "object",
- "properties": {
- "title": {
- "type": "string"
- },
- "message": {
- "type": "string"
- },
- "variant": {
- "type": "string",
- "enum": ["info", "success", "warning", "error"]
- },
- "duration": {
- "description": "Duration in milliseconds",
- "default": 5000,
- "type": "number"
- }
- },
- "required": ["message", "variant"]
- }
- },
- "required": ["type", "properties"]
- },
"Pty": {
"type": "object",
"properties": {
@@ -7079,6 +7114,15 @@
{
"$ref": "#/components/schemas/Event.session.compacted"
},
+ {
+ "$ref": "#/components/schemas/Event.tui.prompt.append"
+ },
+ {
+ "$ref": "#/components/schemas/Event.tui.command.execute"
+ },
+ {
+ "$ref": "#/components/schemas/Event.tui.toast.show"
+ },
{
"$ref": "#/components/schemas/Event.command.executed"
},
@@ -7103,15 +7147,6 @@
{
"$ref": "#/components/schemas/Event.vcs.branch.updated"
},
- {
- "$ref": "#/components/schemas/Event.tui.prompt.append"
- },
- {
- "$ref": "#/components/schemas/Event.tui.command.execute"
- },
- {
- "$ref": "#/components/schemas/Event.tui.toast.show"
- },
{
"$ref": "#/components/schemas/Event.pty.created"
},
@@ -7308,6 +7343,16 @@
"default": "ctrl+alt+g,end",
"type": "string"
},
+ "messages_next": {
+ "description": "Navigate to next message",
+ "default": "none",
+ "type": "string"
+ },
+ "messages_previous": {
+ "description": "Navigate to previous message",
+ "default": "none",
+ "type": "string"
+ },
"messages_last_user": {
"description": "Navigate to last user message",
"default": "none",
@@ -7588,6 +7633,11 @@
"default": "left",
"type": "string"
},
+ "session_parent": {
+ "description": "Go to parent session",
+ "default": "up",
+ "type": "string"
+ },
"terminal_suspend": {
"description": "Suspend terminal",
"default": "ctrl+z",
@@ -7672,6 +7722,24 @@
}
]
},
+ "skill": {
+ "anyOf": [
+ {
+ "type": "string",
+ "enum": ["ask", "allow", "deny"]
+ },
+ {
+ "type": "object",
+ "propertyNames": {
+ "type": "string"
+ },
+ "additionalProperties": {
+ "type": "string",
+ "enum": ["ask", "allow", "deny"]
+ }
+ }
+ ]
+ },
"webfetch": {
"type": "string",
"enum": ["ask", "allow", "deny"]
@@ -8380,6 +8448,24 @@
}
]
},
+ "skill": {
+ "anyOf": [
+ {
+ "type": "string",
+ "enum": ["ask", "allow", "deny"]
+ },
+ {
+ "type": "object",
+ "propertyNames": {
+ "type": "string"
+ },
+ "additionalProperties": {
+ "type": "string",
+ "enum": ["ask", "allow", "deny"]
+ }
+ }
+ ]
+ },
"webfetch": {
"type": "string",
"enum": ["ask", "allow", "deny"]
@@ -9189,6 +9275,16 @@
"enum": ["ask", "allow", "deny"]
}
},
+ "skill": {
+ "type": "object",
+ "propertyNames": {
+ "type": "string"
+ },
+ "additionalProperties": {
+ "type": "string",
+ "enum": ["ask", "allow", "deny"]
+ }
+ },
"webfetch": {
"type": "string",
"enum": ["ask", "allow", "deny"]
@@ -9202,7 +9298,7 @@
"enum": ["ask", "allow", "deny"]
}
},
- "required": ["edit", "bash"]
+ "required": ["edit", "bash", "skill"]
},
"model": {
"type": "object",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index 1d85ced4e..4be3b2ef1 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/slack",
- "version": "1.0.186",
+ "version": "1.0.191",
"type": "module",
"scripts": {
"dev": "bun run src/index.ts",
diff --git a/packages/tauri/.gitignore b/packages/tauri/.gitignore
deleted file mode 100644
index a547bf36d..000000000
--- a/packages/tauri/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/packages/tauri/README.md b/packages/tauri/README.md
deleted file mode 100644
index b381dcf5b..000000000
--- a/packages/tauri/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Tauri + Vanilla TS
-
-This template should help get you started developing with Tauri in vanilla HTML, CSS and Typescript.
-
-## Recommended IDE Setup
-
-- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)
diff --git a/packages/tauri/package.json b/packages/tauri/package.json
deleted file mode 100644
index ff068c65a..000000000
--- a/packages/tauri/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "@opencode-ai/tauri",
- "private": true,
- "version": "1.0.186",
- "type": "module",
- "scripts": {
- "typecheck": "tsgo -b",
- "predev": "bun ./scripts/predev.ts",
- "dev": "vite",
- "build": "bun run typecheck && vite build",
- "preview": "vite preview",
- "tauri": "tauri"
- },
- "dependencies": {
- "@opencode-ai/desktop": "workspace:*",
- "@solid-primitives/storage": "catalog:",
- "@tauri-apps/api": "^2",
- "@tauri-apps/plugin-dialog": "~2",
- "@tauri-apps/plugin-opener": "^2",
- "@tauri-apps/plugin-os": "~2",
- "@tauri-apps/plugin-process": "~2",
- "@tauri-apps/plugin-shell": "~2",
- "@tauri-apps/plugin-store": "~2",
- "@tauri-apps/plugin-updater": "~2",
- "@tauri-apps/plugin-http": "~2",
- "@tauri-apps/plugin-window-state": "~2",
- "solid-js": "catalog:"
- },
- "devDependencies": {
- "@actions/artifact": "4.0.0",
- "@tauri-apps/cli": "^2",
- "@types/bun": "catalog:",
- "@typescript/native-preview": "catalog:",
- "typescript": "~5.6.2",
- "vite": "catalog:"
- }
-}
diff --git a/packages/tauri/vite.config.ts b/packages/tauri/vite.config.ts
deleted file mode 100644
index ead3d8a8d..000000000
--- a/packages/tauri/vite.config.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { defineConfig } from "vite"
-import desktopPlugin from "@opencode-ai/desktop/vite"
-
-const host = process.env.TAURI_DEV_HOST
-
-// https://vite.dev/config/
-export default defineConfig({
- plugins: [desktopPlugin],
- // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
- //
- // 1. prevent Vite from obscuring rust errors
- clearScreen: false,
- // 2. tauri expects a fixed port, fail if that port is not available
- server: {
- port: 1420,
- strictPort: true,
- host: host || false,
- hmr: host
- ? {
- protocol: "ws",
- host,
- port: 1421,
- }
- : undefined,
- watch: {
- // 3. tell Vite to ignore watching `src-tauri`
- ignored: ["**/src-tauri/**"],
- },
- },
-})
diff --git a/packages/ui/package.json b/packages/ui/package.json
index f1fd5b9d8..47a002967 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/ui",
- "version": "1.0.186",
+ "version": "1.0.191",
"type": "module",
"exports": {
"./*": "./src/components/*.tsx",
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index 4f0645bf8..973a06230 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -23,6 +23,7 @@ import { DiffChanges } from "./diff-changes"
import { Markdown } from "./markdown"
import { getDirectory as _getDirectory, getFilename } from "@opencode-ai/util/path"
import { checksum } from "@opencode-ai/util/encode"
+import { createAutoScroll } from "../hooks"
interface Diagnostic {
range: {
@@ -330,6 +331,7 @@ export interface ToolProps {
metadata: Record
tool: string
output?: string
+ status?: string
hideDetails?: boolean
defaultOpen?: boolean
}
@@ -398,6 +400,7 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
tool={part.tool}
metadata={metadata}
output={part.state.status === "completed" ? part.state.output : undefined}
+ status={part.state.status}
hideDetails={props.hideDetails}
defaultOpen={props.defaultOpen}
/>
@@ -561,6 +564,10 @@ ToolRegistry.register({
const summary = () =>
(props.metadata.summary ?? []) as { id: string; tool: string; state: { status: string; title?: string } }[]
+ const autoScroll = createAutoScroll({
+ working: () => true,
+ })
+
return (
-
-
+
+
{(item) => {
const info = getToolInfo(item.tool)
diff --git a/packages/ui/src/components/session-message-rail.css b/packages/ui/src/components/session-message-rail.css
index dc2352c22..5729e4920 100644
--- a/packages/ui/src/components/session-message-rail.css
+++ b/packages/ui/src/components/session-message-rail.css
@@ -17,7 +17,7 @@
display: none;
}
-@container (min-width: 72rem) {
+@container (min-width: 88rem) {
[data-slot="session-message-rail-compact"] {
display: none;
}
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index 71e6689f6..e49e70864 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -3,7 +3,7 @@ import { useData } from "../context"
import { useDiffComponent } from "../context/diff"
import { getDirectory, getFilename } from "@opencode-ai/util/path"
import { checksum } from "@opencode-ai/util/encode"
-import { batch, createEffect, createMemo, For, Match, onCleanup, ParentProps, Show, Switch } from "solid-js"
+import { createEffect, createMemo, For, Match, onCleanup, ParentProps, Show, Switch } from "solid-js"
import { createResizeObserver } from "@solid-primitives/resize-observer"
import { DiffChanges } from "./diff-changes"
import { Typewriter } from "./typewriter"
@@ -19,6 +19,7 @@ import { Button } from "./button"
import { Spinner } from "./spinner"
import { createStore } from "solid-js/store"
import { DateTime, DurationUnit, Interval } from "luxon"
+import { createAutoScroll } from "../hooks"
function computeStatusFromPart(part: PartType | undefined): string | undefined {
if (!part) return undefined
@@ -233,17 +234,14 @@ export function SessionTurn(
})
}
- let scrollRef: HTMLDivElement | undefined
+ const autoScroll = createAutoScroll({
+ working,
+ onUserInteracted: props.onUserInteracted,
+ })
+
const [store, setStore] = createStore({
- contentRef: undefined as HTMLDivElement | undefined,
stickyTitleRef: undefined as HTMLDivElement | undefined,
stickyTriggerRef: undefined as HTMLDivElement | undefined,
- lastScrollTop: 0,
- lastScrollHeight: 0,
- lastContainerWidth: 0,
- autoScrolled: false,
- userScrolled: false,
- reflowing: false,
stickyHeaderHeight: 0,
retrySeconds: 0,
status: rawStatus(),
@@ -265,104 +263,6 @@ export function SessionTurn(
onCleanup(() => clearInterval(timer))
})
- function handleScroll() {
- if (!scrollRef || store.autoScrolled) return
-
- const scrollTop = scrollRef.scrollTop
- const scrollHeight = scrollRef.scrollHeight
-
- if (store.reflowing) {
- batch(() => {
- setStore("lastScrollTop", scrollTop)
- setStore("lastScrollHeight", scrollHeight)
- })
- return
- }
-
- const scrollHeightChanged = Math.abs(scrollHeight - store.lastScrollHeight) > 10
- const scrollTopDelta = scrollTop - store.lastScrollTop
-
- if (scrollHeightChanged && scrollTopDelta < 0) {
- const heightRatio = store.lastScrollHeight > 0 ? scrollHeight / store.lastScrollHeight : 1
- const expectedScrollTop = store.lastScrollTop * heightRatio
- if (Math.abs(scrollTop - expectedScrollTop) < 100) {
- batch(() => {
- setStore("lastScrollTop", scrollTop)
- setStore("lastScrollHeight", scrollHeight)
- })
- return
- }
- }
-
- const reset = scrollTop <= 0 && store.lastScrollTop > 0 && working() && !store.userScrolled
- if (reset) {
- batch(() => {
- setStore("lastScrollTop", scrollTop)
- setStore("lastScrollHeight", scrollHeight)
- })
- requestAnimationFrame(scrollToBottom)
- return
- }
-
- const scrolledUp = scrollTop < store.lastScrollTop - 50 && !scrollHeightChanged
- if (scrolledUp && working()) {
- setStore("userScrolled", true)
- props.onUserInteracted?.()
- }
-
- batch(() => {
- setStore("lastScrollTop", scrollTop)
- setStore("lastScrollHeight", scrollHeight)
- })
- }
-
- function handleInteraction() {
- if (working()) {
- setStore("userScrolled", true)
- props.onUserInteracted?.()
- }
- }
-
- function scrollToBottom() {
- if (!scrollRef || store.userScrolled || !working()) return
- setStore("autoScrolled", true)
- requestAnimationFrame(() => {
- scrollRef?.scrollTo({ top: scrollRef.scrollHeight, behavior: "smooth" })
- requestAnimationFrame(() => {
- batch(() => {
- setStore("lastScrollTop", scrollRef?.scrollTop ?? 0)
- setStore("lastScrollHeight", scrollRef?.scrollHeight ?? 0)
- setStore("autoScrolled", false)
- })
- })
- })
- }
-
- createResizeObserver(
- () => store.contentRef,
- ({ width }) => {
- const widthChanged = Math.abs(width - store.lastContainerWidth) > 5
- if (widthChanged && store.lastContainerWidth > 0) {
- setStore("reflowing", true)
- requestAnimationFrame(() => {
- requestAnimationFrame(() => {
- setStore("reflowing", false)
- if (working() && !store.userScrolled) {
- scrollToBottom()
- }
- })
- })
- } else if (!store.reflowing) {
- scrollToBottom()
- }
- setStore("lastContainerWidth", width)
- },
- )
-
- createEffect(() => {
- if (!working()) setStore("userScrolled", false)
- })
-
createResizeObserver(
() => store.stickyTitleRef,
({ height }) => {
@@ -412,12 +312,17 @@ export function SessionTurn(
return (
-
-
+
+
{(msg) => (
setStore("contentRef", el)}
+ ref={autoScroll.contentRef}
data-message={msg().id}
data-slot="session-turn-message-container"
class={props.classes?.container}
diff --git a/packages/ui/src/hooks/create-auto-scroll.tsx b/packages/ui/src/hooks/create-auto-scroll.tsx
new file mode 100644
index 000000000..d201fe36b
--- /dev/null
+++ b/packages/ui/src/hooks/create-auto-scroll.tsx
@@ -0,0 +1,135 @@
+import { batch, createEffect } from "solid-js"
+import { createStore } from "solid-js/store"
+import { createResizeObserver } from "@solid-primitives/resize-observer"
+
+export interface AutoScrollOptions {
+ working: () => boolean
+ onUserInteracted?: () => void
+}
+
+export function createAutoScroll(options: AutoScrollOptions) {
+ let scrollRef: HTMLElement | undefined
+ const [store, setStore] = createStore({
+ contentRef: undefined as HTMLElement | undefined,
+ lastScrollTop: 0,
+ lastScrollHeight: 0,
+ lastContentWidth: 0,
+ autoScrolled: false,
+ userScrolled: false,
+ reflowing: false,
+ })
+
+ function scrollToBottom() {
+ if (!scrollRef || store.userScrolled || !options.working()) return
+ setStore("autoScrolled", true)
+ requestAnimationFrame(() => {
+ scrollRef?.scrollTo({ top: scrollRef.scrollHeight, behavior: "smooth" })
+ requestAnimationFrame(() => {
+ batch(() => {
+ setStore("lastScrollTop", scrollRef?.scrollTop ?? 0)
+ setStore("lastScrollHeight", scrollRef?.scrollHeight ?? 0)
+ setStore("autoScrolled", false)
+ })
+ })
+ })
+ }
+
+ function handleScroll() {
+ if (!scrollRef || store.autoScrolled) return
+
+ const scrollTop = scrollRef.scrollTop
+ const scrollHeight = scrollRef.scrollHeight
+
+ if (store.reflowing) {
+ batch(() => {
+ setStore("lastScrollTop", scrollTop)
+ setStore("lastScrollHeight", scrollHeight)
+ })
+ return
+ }
+
+ const scrollHeightChanged = Math.abs(scrollHeight - store.lastScrollHeight) > 10
+ const scrollTopDelta = scrollTop - store.lastScrollTop
+
+ // Handle reflow-caused scroll position changes
+ if (scrollHeightChanged && scrollTopDelta < 0) {
+ const heightRatio = store.lastScrollHeight > 0 ? scrollHeight / store.lastScrollHeight : 1
+ const expectedScrollTop = store.lastScrollTop * heightRatio
+ if (Math.abs(scrollTop - expectedScrollTop) < 100) {
+ batch(() => {
+ setStore("lastScrollTop", scrollTop)
+ setStore("lastScrollHeight", scrollHeight)
+ })
+ return
+ }
+ }
+
+ // Handle reset to top while working
+ const reset = scrollTop <= 0 && store.lastScrollTop > 0 && options.working() && !store.userScrolled
+ if (reset) {
+ batch(() => {
+ setStore("lastScrollTop", scrollTop)
+ setStore("lastScrollHeight", scrollHeight)
+ })
+ requestAnimationFrame(scrollToBottom)
+ return
+ }
+
+ // Detect intentional scroll up
+ const scrolledUp = scrollTop < store.lastScrollTop - 50 && !scrollHeightChanged
+ if (scrolledUp && options.working()) {
+ setStore("userScrolled", true)
+ options.onUserInteracted?.()
+ }
+
+ batch(() => {
+ setStore("lastScrollTop", scrollTop)
+ setStore("lastScrollHeight", scrollHeight)
+ })
+ }
+
+ function handleInteraction() {
+ if (options.working()) {
+ setStore("userScrolled", true)
+ options.onUserInteracted?.()
+ }
+ }
+
+ // Reset userScrolled when work completes
+ createEffect(() => {
+ if (!options.working()) setStore("userScrolled", false)
+ })
+
+ // Handle content resize
+ createResizeObserver(
+ () => store.contentRef,
+ ({ width }) => {
+ const widthChanged = Math.abs(width - store.lastContentWidth) > 5
+ if (widthChanged && store.lastContentWidth > 0) {
+ setStore("reflowing", true)
+ requestAnimationFrame(() => {
+ requestAnimationFrame(() => {
+ setStore("reflowing", false)
+ if (options.working() && !store.userScrolled) {
+ scrollToBottom()
+ }
+ })
+ })
+ } else if (!store.reflowing) {
+ scrollToBottom()
+ }
+ setStore("lastContentWidth", width)
+ },
+ )
+
+ return {
+ scrollRef: (el: HTMLElement | undefined) => {
+ scrollRef = el
+ },
+ contentRef: (el: HTMLElement | undefined) => setStore("contentRef", el),
+ handleScroll,
+ handleInteraction,
+ scrollToBottom,
+ userScrolled: () => store.userScrolled,
+ }
+}
diff --git a/packages/ui/src/hooks/index.ts b/packages/ui/src/hooks/index.ts
index 7eef78091..1c90a2e49 100644
--- a/packages/ui/src/hooks/index.ts
+++ b/packages/ui/src/hooks/index.ts
@@ -1 +1,2 @@
export * from "./use-filtered-list"
+export * from "./create-auto-scroll"
diff --git a/packages/ui/src/pierre/index.ts b/packages/ui/src/pierre/index.ts
index f83fc82a2..824d96b11 100644
--- a/packages/ui/src/pierre/index.ts
+++ b/packages/ui/src/pierre/index.ts
@@ -10,6 +10,31 @@ export type DiffProps
= FileDiffOptions & {
}
const unsafeCSS = `
+[data-diffs] {
+ --diffs-bg: light-dark(var(--diffs-light-bg), var(--diffs-dark-bg));
+ --diffs-bg-buffer: var(--diffs-bg-buffer-override, light-dark( color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-mixer))));
+ --diffs-bg-hover: var(--diffs-bg-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 97%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-mixer))));
+ --diffs-bg-context: var(--diffs-bg-context-override, light-dark( color-mix(in lab, var(--diffs-bg) 98.5%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 92.5%, var(--diffs-mixer))));
+ --diffs-bg-separator: var(--diffs-bg-separator-override, light-dark( color-mix(in lab, var(--diffs-bg) 96%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-mixer))));
+ --diffs-fg: light-dark(var(--diffs-light), var(--diffs-dark));
+ --diffs-fg-number: var(--diffs-fg-number-override, light-dark(color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg)), color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg))));
+ --diffs-deletion-base: var(--diffs-deletion-color-override, light-dark(var(--diffs-light-deletion-color, var(--diffs-deletion-color, rgb(255, 0, 0))), var(--diffs-dark-deletion-color, var(--diffs-deletion-color, rgb(255, 0, 0)))));
+ --diffs-addition-base: var(--diffs-addition-color-override, light-dark(var(--diffs-light-addition-color, var(--diffs-addition-color, rgb(0, 255, 0))), var(--diffs-dark-addition-color, var(--diffs-addition-color, rgb(0, 255, 0)))));
+ --diffs-modified-base: var(--diffs-modified-color-override, light-dark(var(--diffs-light-modified-color, var(--diffs-modified-color, rgb(0, 0, 255))), var(--diffs-dark-modified-color, var(--diffs-modified-color, rgb(0, 0, 255)))));
+ --diffs-bg-deletion: var(--diffs-bg-deletion-override, light-dark( color-mix(in lab, var(--diffs-bg) 98%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-deletion-base))));
+ --diffs-bg-deletion-number: var(--diffs-bg-deletion-number-override, light-dark( color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-deletion-base))));
+ --diffs-bg-deletion-hover: var(--diffs-bg-deletion-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 80%, var(--diffs-deletion-base)), color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-deletion-base))));
+ --diffs-bg-deletion-emphasis: var(--diffs-bg-deletion-emphasis-override, light-dark(rgb(from var(--diffs-deletion-base) r g b / 0.7), rgb(from var(--diffs-deletion-base) r g b / 0.1)));
+ --diffs-bg-addition: var(--diffs-bg-addition-override, light-dark( color-mix(in lab, var(--diffs-bg) 98%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-addition-base))));
+ --diffs-bg-addition-number: var(--diffs-bg-addition-number-override, light-dark( color-mix(in lab, var(--diffs-bg) 91%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 85%, var(--diffs-addition-base))));
+ --diffs-bg-addition-hover: var(--diffs-bg-addition-hover-override, light-dark( color-mix(in lab, var(--diffs-bg) 80%, var(--diffs-addition-base)), color-mix(in lab, var(--diffs-bg) 70%, var(--diffs-addition-base))));
+ --diffs-bg-addition-emphasis: var(--diffs-bg-addition-emphasis-override, light-dark(rgb(from var(--diffs-addition-base) r g b / 0.07), rgb(from var(--diffs-addition-base) r g b / 0.1)));
+ --diffs-selection-base: var(--diffs-modified-base);
+ --diffs-selection-number-fg: light-dark( color-mix(in lab, var(--diffs-selection-base) 65%, var(--diffs-mixer)), color-mix(in lab, var(--diffs-selection-base) 75%, var(--diffs-mixer)));
+ --diffs-bg-selection: var(--diffs-bg-selection-override, light-dark( color-mix(in lab, var(--diffs-bg) 82%, var(--diffs-selection-base)), color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-selection-base))));
+ --diffs-bg-selection-number: var(--diffs-bg-selection-number-override, light-dark( color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-selection-base)), color-mix(in lab, var(--diffs-bg) 60%, var(--diffs-selection-base))));
+}
+
[data-diffs-header],
[data-diffs] {
[data-separator-wrapper] {
diff --git a/packages/util/package.json b/packages/util/package.json
index f2fb03145..9194b1e9f 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/util",
- "version": "1.0.186",
+ "version": "1.0.191",
"private": true,
"type": "module",
"exports": {
diff --git a/packages/web/package.json b/packages/web/package.json
index 9b2609dec..6f9ba171c 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,7 +1,7 @@
{
"name": "@opencode-ai/web",
"type": "module",
- "version": "1.0.186",
+ "version": "1.0.191",
"scripts": {
"dev": "astro dev",
"dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
@@ -28,7 +28,6 @@
"marked-shiki": "1.2.1",
"rehype-autolink-headings": "7.1.0",
"remeda": "catalog:",
- "sharp": "0.32.5",
"shiki": "3.4.2",
"solid-js": "catalog:",
"toolbeam-docs-theme": "0.4.8"
diff --git a/packages/web/src/content/docs/ecosystem.mdx b/packages/web/src/content/docs/ecosystem.mdx
index 8f7b201b6..48ae971fe 100644
--- a/packages/web/src/content/docs/ecosystem.mdx
+++ b/packages/web/src/content/docs/ecosystem.mdx
@@ -29,6 +29,7 @@ You can also check out [awesome-opencode](https://github.com/awesome-opencode/aw
| [opencode-pty](https://github.com/shekohex/opencode-pty.git) | Enables AI agents to run background processes in a PTY, send interactive input to them. |
| [opencode-wakatime](https://github.com/angristan/opencode-wakatime) | Track OpenCode usage with Wakatime |
| [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main) | Clean up markdown tables produced by LLMs |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply) | 10x faster code editing with Morph Fast Apply API and lazy edit markers |
| [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode) | Background agents, pre-built LSP/AST/MCP tools, curated agents, Claude Code compatible |
| [opencode-zellij-namer](https://github.com/24601/opencode-zellij-namer) | AI-powered automatic Zellij session naming based on OpenCode context |
@@ -44,6 +45,7 @@ You can also check out [awesome-opencode](https://github.com/awesome-opencode/aw
| [opencode plugin template](https://github.com/zenobi-us/opencode-plugin-template/) | Template for building OpenCode plugins |
| [opencode.nvim](https://github.com/sudo-tee/opencode.nvim) | Neovim frontend for opencode - a terminal-based AI coding agent |
| [ai-sdk-provider-opencode-sdk](https://github.com/ben-vargas/ai-sdk-provider-opencode-sdk) | Vercel AI SDK provider for using OpenCode via @opencode-ai/sdk |
+| [OpenChamber](https://github.com/btriapitsyn/openchamber) | Web / Desktop App and VS Code Extension for OpenCode |
---
diff --git a/packages/web/src/content/docs/github.mdx b/packages/web/src/content/docs/github.mdx
index bd792f92f..25c3ce927 100644
--- a/packages/web/src/content/docs/github.mdx
+++ b/packages/web/src/content/docs/github.mdx
@@ -109,6 +109,7 @@ OpenCode can be triggered by the following GitHub events:
| `issue_comment` | Comment on an issue or PR | Mention `/opencode` or `/oc` in your comment. OpenCode reads the issue/PR context and can create branches, open PRs, or reply with explanations. |
| `pull_request_review_comment` | Comment on specific code lines in a PR | Mention `/opencode` or `/oc` while reviewing code. OpenCode receives file path, line numbers, and diff context for precise responses. |
| `schedule` | Cron-based schedule | Run OpenCode on a schedule using the `prompt` input. Useful for automated code reviews, reports, or maintenance tasks. OpenCode can create issues or PRs as needed. |
+| `pull_request` | PR opened or updated | Automatically trigger OpenCode when PRs are opened, synchronized, or reopened. Useful for automated reviews without needing to leave a comment. |
### Schedule Example
@@ -150,6 +151,43 @@ For scheduled events, the `prompt` input is **required** since there's no commen
---
+### Pull Request Example
+
+Automatically review PRs when they are opened or updated:
+
+```yaml title=".github/workflows/opencode-review.yml"
+name: opencode-review
+
+on:
+ pull_request:
+ types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+ review:
+ runs-on: ubuntu-latest
+ permissions:
+ id-token: write
+ contents: read
+ pull-requests: read
+ issues: read
+ steps:
+ - uses: actions/checkout@v4
+ - uses: sst/opencode/github@latest
+ env:
+ ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+ with:
+ model: anthropic/claude-sonnet-4-20250514
+ prompt: |
+ Review this pull request:
+ - Check for code quality issues
+ - Look for potential bugs
+ - Suggest improvements
+```
+
+For `pull_request` events, if no `prompt` is provided, OpenCode defaults to reviewing the pull request.
+
+---
+
## Custom prompts
Override the default prompt to customize OpenCode's behavior for your workflow.
diff --git a/packages/web/src/content/docs/gitlab.mdx b/packages/web/src/content/docs/gitlab.mdx
index 66c006c80..e8f43f85f 100644
--- a/packages/web/src/content/docs/gitlab.mdx
+++ b/packages/web/src/content/docs/gitlab.mdx
@@ -3,12 +3,55 @@ title: GitLab
description: Use OpenCode in GitLab issues and merge requests.
---
+OpenCode integrates with your GitLab workflow through your GitLab CI/CD pipeline or with GitLab Duo.
+
+In both cases, OpenCode will run on your GitLab runners.
+
+---
+
+## GitLab CI
+
+OpenCode works in a regular GitLab pipeline. You can build it into a pipeline as a [CI component](https://docs.gitlab.com/ee/ci/components/)
+
+Here we are using a community-created CI/CD component for OpenCode — [nagyv/gitlab-opencode](https://gitlab.com/nagyv/gitlab-opencode).
+
+---
+
+### Features
+
+- **Use custom configuration per job**: Configure OpenCode with a custom configuration directory, for example `./config/#custom-directory` to enable or disable functionality per OpenCode invocation.
+- **Minimal setup**: The CI component sets up OpenCode in the background, you only need to create the OpenCode configuration and the initial prompt.
+- **Flexible**: The CI component supports several inputs for customizing its behavior
+
+---
+
+### Setup
+
+1. Store your OpenCode authentication JSON as a File type CI environment variables under **Settings** > **CI/CD** > **Variables**. Make sure to mark them as "Masked and hidden".
+2. Add the following to your `.gitlab-ci.yml` file.
+
+ ```yaml title=".gitlab-ci.yml"
+ include:
+ - component: $CI_SERVER_FQDN/nagyv/gitlab-opencode/opencode@1.0.0
+ inputs:
+ config_dir: ${CI_PROJECT_DIR}/opencode-config
+ auth_json: $OPENCODE_AUTH_JSON # The variable name for your OpenCode authentication JSON
+ command: optional-custom-command
+ message: "Your prompt here"
+ ```
+
+For more inputs and use cases [check out the docs](https://gitlab.com/explore/catalog/nagyv/gitlab-opencode) for this component.
+
+---
+
+## GitLab Duo
+
OpenCode integrates with your GitLab workflow.
Mention `@opencode` in a comment, and OpenCode will execute tasks within your GitLab CI pipeline.
---
-## Features
+### Features
- **Triage issues**: Ask OpenCode to look into an issue and explain it to you.
- **Fix and implement**: Ask OpenCode to fix an issue or implement a feature.
@@ -17,7 +60,7 @@ Mention `@opencode` in a comment, and OpenCode will execute tasks within your Gi
---
-## Setup
+### Setup
OpenCode runs in your GitLab CI/CD pipeline, here's what you'll need to set it up:
@@ -113,7 +156,7 @@ You can refer to the [GitLab CLI agents docs](https://docs.gitlab.com/user/duo_a
---
-## Examples
+### Examples
Here are some examples of how you can use OpenCode in GitLab.
diff --git a/packages/web/src/content/docs/keybinds.mdx b/packages/web/src/content/docs/keybinds.mdx
index 35610af51..b7e370825 100644
--- a/packages/web/src/content/docs/keybinds.mdx
+++ b/packages/web/src/content/docs/keybinds.mdx
@@ -32,6 +32,8 @@ OpenCode has a list of keybinds that you can customize through the OpenCode conf
"messages_half_page_down": "ctrl+alt+d",
"messages_first": "ctrl+g,home",
"messages_last": "ctrl+alt+g,end",
+ "messages_next": "none",
+ "messages_previous": "none",
"messages_copy": "y",
"messages_undo": "u",
"messages_redo": "r",
diff --git a/packages/web/src/content/docs/lsp.mdx b/packages/web/src/content/docs/lsp.mdx
index df97dc3ff..230f782d3 100644
--- a/packages/web/src/content/docs/lsp.mdx
+++ b/packages/web/src/content/docs/lsp.mdx
@@ -17,6 +17,7 @@ OpenCode comes with several built-in LSP servers for popular languages:
| bash | .sh, .bash, .zsh, .ksh | Auto-installs bash-language-server |
| clangd | .c, .cpp, .cc, .cxx, .c++, .h, .hpp, .hh, .hxx, .h++ | Auto-installs for C/C++ projects |
| csharp | .cs | `.NET SDK` installed |
+| clojure-lsp | .clj, .cljs, .cljc, .edn | `clojure-lsp` command available |
| dart | .dart | `dart` command available |
| deno | .ts, .tsx, .js, .jsx, .mjs | `deno` command available (auto-detects deno.json/deno.jsonc) |
| elixir-ls | .ex, .exs | `elixir` command available |
@@ -36,6 +37,7 @@ OpenCode comes with several built-in LSP servers for popular languages:
| sourcekit-lsp | .swift, .objc, .objcpp | `swift` installed (`xcode` on macOS) |
| svelte | .svelte | Auto-installs for Svelte projects |
| terraform | .tf, .tfvars | Auto-installs from GitHub releases |
+| tinymist | .typ, .typc | Auto-installs from GitHub releases |
| typescript | .ts, .tsx, .js, .jsx, .mjs, .cjs, .mts, .cts | `typescript` dependency in project |
| vue | .vue | Auto-installs for Vue projects |
| yaml-ls | .yaml, .yml | Auto-installs Red Hat yaml-language-server |
diff --git a/packages/web/src/content/docs/plugins.mdx b/packages/web/src/content/docs/plugins.mdx
index 6982b4c93..6be545482 100644
--- a/packages/web/src/content/docs/plugins.mdx
+++ b/packages/web/src/content/docs/plugins.mdx
@@ -233,3 +233,30 @@ Include any state that should persist across compaction:
```
The `experimental.session.compacting` hook fires before the LLM generates a continuation summary. Use it to inject domain-specific context that the default compaction prompt would miss.
+
+You can also replace the compaction prompt entirely by setting `output.prompt`:
+
+```ts title=".opencode/plugin/custom-compaction.ts"
+import type { Plugin } from "@opencode-ai/plugin"
+
+export const CustomCompactionPlugin: Plugin = async (ctx) => {
+ return {
+ "experimental.session.compacting": async (input, output) => {
+ // Replace the entire compaction prompt
+ output.prompt = `
+You are generating a continuation prompt for a multi-agent swarm session.
+
+Summarize:
+1. The current task and its status
+2. Which files are being modified and by whom
+3. Any blockers or dependencies between agents
+4. The next steps to complete the work
+
+Format as a structured prompt that a new agent can use to resume work.
+`
+ },
+ }
+}
+```
+
+When `output.prompt` is set, it completely replaces the default compaction prompt. The `output.context` array is ignored in this case.
diff --git a/packages/web/src/content/docs/sdk.mdx b/packages/web/src/content/docs/sdk.mdx
index 4f9a2959f..1ff843103 100644
--- a/packages/web/src/content/docs/sdk.mdx
+++ b/packages/web/src/content/docs/sdk.mdx
@@ -123,6 +123,23 @@ The SDK exposes all server APIs through a type-safe client.
---
+### Global
+
+| Method | Description | Response |
+| ----------------- | ------------------------------- | ------------------------------------ |
+| `global.health()` | Check server health and version | `{ healthy: true, version: string }` |
+
+---
+
+#### Examples
+
+```javascript
+const health = await client.global.health()
+console.log(health.data.version)
+```
+
+---
+
### App
| Method | Description | Response |
diff --git a/packages/web/src/content/docs/server.mdx b/packages/web/src/content/docs/server.mdx
index 60aff2003..427d8f505 100644
--- a/packages/web/src/content/docs/server.mdx
+++ b/packages/web/src/content/docs/server.mdx
@@ -68,11 +68,12 @@ The opencode server exposes the following APIs.
---
-### Global Events
+### Global
-| Method | Path | Description | Response |
-| ------ | --------------- | ------------------------------ | ------------ |
-| `GET` | `/global/event` | Get global events (SSE stream) | Event stream |
+| Method | Path | Description | Response |
+| ------ | ---------------- | ------------------------------ | ------------------------------------ |
+| `GET` | `/global/health` | Get server health and version | `{ healthy: true, version: string }` |
+| `GET` | `/global/event` | Get global events (SSE stream) | Event stream |
---
diff --git a/packages/web/src/content/docs/skills.mdx b/packages/web/src/content/docs/skills.mdx
index 217d4b3d2..c1d433a83 100644
--- a/packages/web/src/content/docs/skills.mdx
+++ b/packages/web/src/content/docs/skills.mdx
@@ -4,7 +4,7 @@ description: "Define reusable behavior via SKILL.md definitions"
---
Agent skills let OpenCode discover reusable instructions from your repo or home directory.
-When a conversation matches a skill, the agent is prompted to read its `SKILL.md`.
+Skills are loaded on-demand via the native `skill` tool—agents see available skills and can load the full content when needed.
---
@@ -97,24 +97,123 @@ Ask clarifying questions if the target versioning scheme is unclear.
---
-## Recognize prompt injection
+## Recognize tool description
-OpenCode adds an `` XML block to the system prompt.
-Each entry includes the skill name, description, and its discovered location.
+OpenCode lists available skills in the `skill` tool description.
+Each entry includes the skill name and description:
```xml
git-release
Create consistent releases and changelogs
- .opencode/skill/git-release/SKILL.md
```
+The agent loads a skill by calling the tool:
+
+```
+skill({ name: "git-release" })
+```
+
+---
+
+## Configure permissions
+
+Control which skills agents can access using pattern-based permissions in `opencode.json`:
+
+```json
+{
+ "permission": {
+ "skill": {
+ "pr-review": "allow",
+ "internal-*": "deny",
+ "experimental-*": "ask",
+ "*": "allow"
+ }
+ }
+}
+```
+
+| Permission | Behavior |
+| ---------- | ----------------------------------------- |
+| `allow` | Skill loads immediately |
+| `deny` | Skill hidden from agent, access rejected |
+| `ask` | User prompted for approval before loading |
+
+Patterns support wildcards: `internal-*` matches `internal-docs`, `internal-tools`, etc.
+
+---
+
+## Override per agent
+
+Give specific agents different permissions than the global defaults.
+
+**For custom agents** (in agent frontmatter):
+
+```yaml
+---
+permission:
+ skill:
+ "documents-*": "allow"
+---
+```
+
+**For built-in agents** (in `opencode.json`):
+
+```json
+{
+ "agent": {
+ "plan": {
+ "permission": {
+ "skill": {
+ "internal-*": "allow"
+ }
+ }
+ }
+ }
+}
+```
+
+---
+
+## Disable the skill tool
+
+Completely disable skills for agents that shouldn't use them:
+
+**For custom agents**:
+
+```yaml
+---
+tools:
+ skill: false
+---
+```
+
+**For built-in agents**:
+
+```json
+{
+ "agent": {
+ "plan": {
+ "tools": {
+ "skill": false
+ }
+ }
+ }
+}
+```
+
+When disabled, the `` section is omitted entirely.
+
---
## Troubleshoot loading
-If a skill does not show up, verify the folder name matches `name` exactly.
-Also check that `SKILL.md` is spelled in all caps and includes frontmatter.
+If a skill does not show up:
+
+1. Verify `SKILL.md` is spelled in all caps
+2. Check that frontmatter includes `name` and `description`
+3. Ensure skill names are unique across all locations
+4. Check permissions—skills with `deny` are hidden from agents
diff --git a/packages/web/src/content/docs/zen.mdx b/packages/web/src/content/docs/zen.mdx
index 134271ca1..4b268ab4f 100644
--- a/packages/web/src/content/docs/zen.mdx
+++ b/packages/web/src/content/docs/zen.mdx
@@ -77,6 +77,7 @@ You can also access our models through the following API endpoints.
| Claude Haiku 3.5 | claude-3-5-haiku | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
| Claude Opus 4.5 | claude-opus-4-5 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
| Claude Opus 4.1 | claude-opus-4-1 | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
+| GLM 4.7 | glm-4.7-free | `https://opencode.ai/zen/v1/messages` | `@ai-sdk/anthropic` |
| Gemini 3 Pro | gemini-3-pro | `https://opencode.ai/zen/v1/models/gemini-3-pro` | `@ai-sdk/google` |
| Gemini 3 Flash | gemini-3-flash | `https://opencode.ai/zen/v1/models/gemini-3-flash` | `@ai-sdk/google` |
| GLM 4.6 | glm-4.6 | `https://opencode.ai/zen/v1/chat/completions` | `@ai-sdk/openai-compatible` |
@@ -110,6 +111,7 @@ We support a pay-as-you-go model. Below are the prices **per 1M tokens**.
| --------------------------------- | ------ | ------ | ----------- | ------------ |
| Big Pickle | Free | Free | Free | - |
| Grok Code Fast 1 | Free | Free | Free | - |
+| GLM 4.7 | Free | Free | Free | - |
| GLM 4.6 | $0.60 | $2.20 | $0.10 | - |
| Kimi K2 | $0.40 | $2.50 | - | - |
| Kimi K2 Thinking | $0.40 | $2.50 | - | - |
diff --git a/script/publish-start.ts b/script/publish-start.ts
index 229435ddf..a846df14d 100755
--- a/script/publish-start.ts
+++ b/script/publish-start.ts
@@ -17,16 +17,9 @@ if (!Script.preview) {
.then((data: any) => data.version)
const log =
- await $`git log v${previous}..HEAD --oneline --format="%h %s" -- packages/opencode packages/sdk packages/plugin packages/tauri packages/desktop`.text()
+ await $`git log v${previous}..HEAD --oneline --format="%h %s" -- packages/opencode packages/sdk packages/plugin packages/desktop packages/app`.text()
- const commits = log
- .split("\n")
- .filter((line) => line && !line.match(/^\w+ (ignore:|test:|chore:|ci:)/i))
- .join("\n")
-
- const opencode = await createOpencode()
- const session = await opencode.client.session.create()
- console.log("generating changelog since " + previous)
+ const commits = log.split("\n").filter((line) => line && !line.match(/^\w+ (ignore:|test:|chore:|ci:)/i))
const team = [
"actions-user",
@@ -41,20 +34,25 @@ if (!Script.preview) {
"opencode-agent[bot]",
]
- const raw = await opencode.client.session
- .prompt({
- path: {
- id: session.data!.id,
- },
- body: {
- model: {
- providerID: "opencode",
- modelID: "gemini-3-flash",
+ async function generateChangelog() {
+ const opencode = await createOpencode()
+ const session = await opencode.client.session.create()
+ console.log("generating changelog since " + previous)
+
+ const raw = await opencode.client.session
+ .prompt({
+ path: {
+ id: session.data!.id,
},
- parts: [
- {
- type: "text",
- text: `
+ body: {
+ model: {
+ providerID: "opencode",
+ modelID: "gemini-3-flash",
+ },
+ parts: [
+ {
+ type: "text",
+ text: `
Analyze these commits and generate a changelog of all notable user facing changes, grouped by area.
Each commit below includes:
@@ -62,11 +60,11 @@ if (!Script.preview) {
- [areas: ...] showing which areas of the codebase were modified
Commits between ${previous} and HEAD:
- ${commits}
+ ${commits.join("\n")}
Group the changes into these categories based on the [areas: ...] tags (omit any category with no changes):
- **TUI**: Changes to "opencode" area (the terminal/CLI interface)
- - **Desktop**: Changes to "desktop" or "tauri" areas (the desktop application)
+ - **Desktop**: Changes to "app" or "tauri" areas (the desktop application)
- **SDK**: Changes to "sdk" or "plugin" areas (the SDK and plugin system)
- **Extensions**: Changes to "extensions/zed", "extensions/vscode", or "github" areas (editor extensions and GitHub Action)
- **Other**: Any user-facing changes that don't fit the above categories
@@ -105,20 +103,34 @@ if (!Script.preview) {
- Added OIDC_BASE_URL support for custom GitHub App installations (@elithrar)
`,
- },
- ],
- },
- })
- .then((x) => x.data?.parts?.find((y) => y.type === "text")?.text)
- for (const line of raw?.split("\n") ?? []) {
- if (line.startsWith("- ")) {
- notes.push(line)
+ },
+ ],
+ },
+ })
+ .then((x) => x.data?.parts?.find((y) => y.type === "text")?.text)
+ opencode.server.close()
+ return raw
+ }
+
+ const timeout = new Promise((resolve) => setTimeout(() => resolve(null), 120_000))
+ const raw = await Promise.race([generateChangelog(), timeout])
+
+ if (raw) {
+ for (const line of raw.split("\n")) {
+ if (line.startsWith("- ")) {
+ notes.push(line)
+ }
+ }
+ console.log("---- Generated Changelog ----")
+ console.log(notes.join("\n"))
+ console.log("-----------------------------")
+ } else {
+ console.log("Changelog generation timed out, using raw commits")
+ for (const commit of commits) {
+ const message = commit.replace(/^\w+ /, "")
+ notes.push(`- ${message}`)
}
}
- console.log("---- Generated Changelog ----")
- console.log(notes.join("\n"))
- console.log("-----------------------------")
- opencode.server.close()
const compare =
await $`gh api "/repos/sst/opencode/compare/v${previous}...HEAD" --jq '.commits[] | {login: .author.login, message: .commit.message}'`.text()
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index be3139886..791533d63 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.0.186",
+ "version": "1.0.191",
"publisher": "sst-dev",
"repository": {
"type": "git",
diff --git a/sdks/vscode/src/extension.ts b/sdks/vscode/src/extension.ts
index 63d8d332e..105ab0293 100644
--- a/sdks/vscode/src/extension.ts
+++ b/sdks/vscode/src/extension.ts
@@ -35,7 +35,7 @@ export function activate(context: vscode.ExtensionContext) {
if (terminal.name === TERMINAL_NAME) {
// @ts-ignore
const port = terminal.creationOptions.env?.["_EXTENSION_OPENCODE_PORT"]
- port ? await appendPrompt(parseInt(port), fileRef) : terminal.sendText(fileRef)
+ port ? await appendPrompt(parseInt(port), fileRef) : terminal.sendText(fileRef, false)
terminal.show()
}
})
diff --git a/sst-env.d.ts b/sst-env.d.ts
index 2c182ec35..813d654a0 100644
--- a/sst-env.d.ts
+++ b/sst-env.d.ts
@@ -148,6 +148,10 @@ declare module "sst" {
"name": string
"type": "sst.cloudflare.Bucket"
}
+ "ZenDataNew": {
+ "name": string
+ "type": "sst.cloudflare.Bucket"
+ }
}
}
///