diff --git a/packages/app/src/components/dialog-select-server.tsx b/packages/app/src/components/dialog-select-server.tsx
index eb039c14d6..f8d14cbb94 100644
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -291,8 +291,8 @@ export function DialogSelectServer() {
navigate("/")
return
}
- server.setActive(ServerConnection.key(conn))
navigate("/")
+ queueMicrotask(() => server.setActive(ServerConnection.key(conn)))
}
const handleAddChange = (value: string) => {
diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 5c25235c65..55cfaa490f 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -1241,6 +1241,20 @@ export const PromptInput: Component
= (props) => {
// Note: Shift+Enter is handled earlier, before IME check
if (event.key === "Enter" && !event.shiftKey) {
+ event.preventDefault()
+ if (event.repeat) return
+ if (
+ working() &&
+ prompt
+ .current()
+ .map((part) => ("content" in part ? part.content : ""))
+ .join("")
+ .trim().length === 0 &&
+ imageAttachments().length === 0 &&
+ commentCount() === 0
+ ) {
+ return
+ }
handleSubmit(event)
}
}
diff --git a/packages/app/src/components/status-popover.tsx b/packages/app/src/components/status-popover.tsx
index 61facb84eb..063205f0c3 100644
--- a/packages/app/src/components/status-popover.tsx
+++ b/packages/app/src/components/status-popover.tsx
@@ -277,8 +277,8 @@ export function StatusPopover() {
aria-disabled={isBlocked()}
onClick={() => {
if (isBlocked()) return
- server.setActive(key)
navigate("/")
+ queueMicrotask(() => server.setActive(key))
}}
>
diff --git a/packages/app/src/components/terminal.tsx b/packages/app/src/components/terminal.tsx
index 9297d66266..aed46f1262 100644
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -165,6 +165,12 @@ export const Terminal = (props: TerminalProps) => {
const theme = useTheme()
const language = useLanguage()
const server = useServer()
+ const directory = sdk.directory
+ const client = sdk.client
+ const url = sdk.url
+ const auth = server.current?.http
+ const username = auth?.username ?? "opencode"
+ const password = auth?.password ?? ""
let container!: HTMLDivElement
const [local, others] = splitProps(props, ["pty", "class", "classList", "autoFocus", "onConnect", "onConnectError"])
const id = local.pty.id
@@ -215,7 +221,7 @@ export const Terminal = (props: TerminalProps) => {
}
const pushSize = (cols: number, rows: number) => {
- return sdk.client.pty
+ return client.pty
.update({
ptyID: id,
size: { cols, rows },
@@ -474,7 +480,7 @@ export const Terminal = (props: TerminalProps) => {
}
const gone = () =>
- sdk.client.pty
+ client.pty
.get({ ptyID: id })
.then(() => false)
.catch((err) => {
@@ -506,14 +512,14 @@ export const Terminal = (props: TerminalProps) => {
if (disposed) return
drop?.()
- const url = new URL(sdk.url + `/pty/${id}/connect`)
- url.searchParams.set("directory", sdk.directory)
- url.searchParams.set("cursor", String(seek))
- url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
- url.username = server.current?.http.username ?? "opencode"
- url.password = server.current?.http.password ?? ""
+ const next = new URL(url + `/pty/${id}/connect`)
+ next.searchParams.set("directory", directory)
+ next.searchParams.set("cursor", String(seek))
+ next.protocol = next.protocol === "https:" ? "wss:" : "ws:"
+ next.username = username
+ next.password = password
- const socket = new WebSocket(url)
+ const socket = new WebSocket(next)
socket.binaryType = "arraybuffer"
ws = socket
diff --git a/packages/app/src/context/terminal.tsx b/packages/app/src/context/terminal.tsx
index e65c167884..17355aab9a 100644
--- a/packages/app/src/context/terminal.tsx
+++ b/packages/app/src/context/terminal.tsx
@@ -185,6 +185,60 @@ function createWorkspaceTerminalSession(sdk: ReturnType, dir: str
})
onCleanup(unsub)
+ const update = (client: ReturnType["client"], pty: Partial & { id: string }) => {
+ const index = store.all.findIndex((x) => x.id === pty.id)
+ const previous = index >= 0 ? store.all[index] : undefined
+ if (index >= 0) {
+ setStore("all", index, (item) => ({ ...item, ...pty }))
+ }
+ client.pty
+ .update({
+ ptyID: pty.id,
+ title: pty.title,
+ size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
+ })
+ .catch((error: unknown) => {
+ if (previous) {
+ const currentIndex = store.all.findIndex((item) => item.id === pty.id)
+ if (currentIndex >= 0) setStore("all", currentIndex, previous)
+ }
+ console.error("Failed to update terminal", error)
+ })
+ }
+
+ const clone = async (client: ReturnType["client"], id: string) => {
+ const index = store.all.findIndex((x) => x.id === id)
+ const pty = store.all[index]
+ if (!pty) return
+ const next = await client.pty
+ .create({
+ title: pty.title,
+ })
+ .catch((error: unknown) => {
+ console.error("Failed to clone terminal", error)
+ return undefined
+ })
+ if (!next?.data) return
+
+ const active = store.active === pty.id
+
+ batch(() => {
+ setStore("all", index, {
+ id: next.data.id,
+ title: next.data.title ?? pty.title,
+ titleNumber: pty.titleNumber,
+ buffer: undefined,
+ cursor: undefined,
+ scrollY: undefined,
+ rows: undefined,
+ cols: undefined,
+ })
+ if (active) {
+ setStore("active", next.data.id)
+ }
+ })
+ }
+
return {
ready,
all: createMemo(() => store.all),
@@ -216,24 +270,7 @@ function createWorkspaceTerminalSession(sdk: ReturnType, dir: str
})
},
update(pty: Partial & { id: string }) {
- const index = store.all.findIndex((x) => x.id === pty.id)
- const previous = index >= 0 ? store.all[index] : undefined
- if (index >= 0) {
- setStore("all", index, (item) => ({ ...item, ...pty }))
- }
- sdk.client.pty
- .update({
- ptyID: pty.id,
- title: pty.title,
- size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
- })
- .catch((error: unknown) => {
- if (previous) {
- const currentIndex = store.all.findIndex((item) => item.id === pty.id)
- if (currentIndex >= 0) setStore("all", currentIndex, previous)
- }
- console.error("Failed to update terminal", error)
- })
+ update(sdk.client, pty)
},
trim(id: string) {
const index = store.all.findIndex((x) => x.id === id)
@@ -248,37 +285,23 @@ function createWorkspaceTerminalSession(sdk: ReturnType, dir: str
})
},
async clone(id: string) {
- const index = store.all.findIndex((x) => x.id === id)
- const pty = store.all[index]
- if (!pty) return
- const clone = await sdk.client.pty
- .create({
- title: pty.title,
- })
- .catch((error: unknown) => {
- console.error("Failed to clone terminal", error)
- return undefined
- })
- if (!clone?.data) return
-
- const active = store.active === pty.id
-
- batch(() => {
- setStore("all", index, {
- id: clone.data.id,
- title: clone.data.title ?? pty.title,
- titleNumber: pty.titleNumber,
- // New PTY process, so start clean.
- buffer: undefined,
- cursor: undefined,
- scrollY: undefined,
- rows: undefined,
- cols: undefined,
- })
- if (active) {
- setStore("active", clone.data.id)
- }
- })
+ await clone(sdk.client, id)
+ },
+ bind() {
+ const client = sdk.client
+ return {
+ trim(id: string) {
+ const index = store.all.findIndex((x) => x.id === id)
+ if (index === -1) return
+ setStore("all", index, (pty) => trimTerminal(pty))
+ },
+ update(pty: Partial & { id: string }) {
+ update(client, pty)
+ },
+ async clone(id: string) {
+ await clone(client, id)
+ },
+ }
},
open(id: string) {
setStore("active", id)
@@ -403,6 +426,7 @@ export const { use: useTerminal, provider: TerminalProvider } = createSimpleCont
trim: (id: string) => workspace().trim(id),
trimAll: () => workspace().trimAll(),
clone: (id: string) => workspace().clone(id),
+ bind: () => workspace(),
open: (id: string) => workspace().open(id),
close: (id: string) => workspace().close(id),
move: (id: string, to: number) => workspace().move(id, to),
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index 720045a4d1..c8f58c796e 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -204,6 +204,7 @@ export const dict = {
"common.cancel": "إلغاء",
"common.connect": "اتصال",
"common.disconnect": "قطع الاتصال",
+ "common.continue": "إرسال",
"common.submit": "إرسال",
"common.save": "حفظ",
"common.saving": "جارٍ الحفظ...",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index a7d7433b02..3112e91bbe 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -204,6 +204,7 @@ export const dict = {
"common.cancel": "Cancelar",
"common.connect": "Conectar",
"common.disconnect": "Desconectar",
+ "common.continue": "Enviar",
"common.submit": "Enviar",
"common.save": "Salvar",
"common.saving": "Salvando...",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index ccdf2b6044..f2dbd8493c 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -221,6 +221,7 @@ export const dict = {
"common.cancel": "Otkaži",
"common.connect": "Poveži",
"common.disconnect": "Prekini vezu",
+ "common.continue": "Pošalji",
"common.submit": "Pošalji",
"common.save": "Sačuvaj",
"common.saving": "Čuvanje...",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index f1701094b5..e90e1071ad 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -219,6 +219,7 @@ export const dict = {
"common.cancel": "Annuller",
"common.connect": "Forbind",
"common.disconnect": "Frakobl",
+ "common.continue": "Indsend",
"common.submit": "Indsend",
"common.save": "Gem",
"common.saving": "Gemmer...",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index 2dfeed7203..69658b29e9 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -209,6 +209,7 @@ export const dict = {
"common.cancel": "Abbrechen",
"common.connect": "Verbinden",
"common.disconnect": "Trennen",
+ "common.continue": "Absenden",
"common.submit": "Absenden",
"common.save": "Speichern",
"common.saving": "Speichert...",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 7f6816de9e..72caed40ad 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -221,6 +221,7 @@ export const dict = {
"common.open": "Open",
"common.connect": "Connect",
"common.disconnect": "Disconnect",
+ "common.continue": "Continue",
"common.submit": "Submit",
"common.save": "Save",
"common.saving": "Saving...",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index 1cd47dfc79..9e36e4de6d 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -220,6 +220,7 @@ export const dict = {
"common.cancel": "Cancelar",
"common.connect": "Conectar",
"common.disconnect": "Desconectar",
+ "common.continue": "Enviar",
"common.submit": "Enviar",
"common.save": "Guardar",
"common.saving": "Guardando...",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index c7d89c3251..f53b3882c6 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -204,6 +204,7 @@ export const dict = {
"common.cancel": "Annuler",
"common.connect": "Connecter",
"common.disconnect": "Déconnecter",
+ "common.continue": "Soumettre",
"common.submit": "Soumettre",
"common.save": "Enregistrer",
"common.saving": "Enregistrement...",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index 267411083f..d66a7341d5 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -203,6 +203,7 @@ export const dict = {
"common.cancel": "キャンセル",
"common.connect": "接続",
"common.disconnect": "切断",
+ "common.continue": "送信",
"common.submit": "送信",
"common.save": "保存",
"common.saving": "保存中...",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index bb57f99396..d534c27e8f 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -207,6 +207,7 @@ export const dict = {
"common.cancel": "취소",
"common.connect": "연결",
"common.disconnect": "연결 해제",
+ "common.continue": "제출",
"common.submit": "제출",
"common.save": "저장",
"common.saving": "저장 중...",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 83d6a9903b..c23d0a2792 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -223,6 +223,7 @@ export const dict = {
"common.cancel": "Avbryt",
"common.connect": "Koble til",
"common.disconnect": "Koble fra",
+ "common.continue": "Send inn",
"common.submit": "Send inn",
"common.save": "Lagre",
"common.saving": "Lagrer...",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index db9ef18003..dac847b217 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -205,6 +205,7 @@ export const dict = {
"common.cancel": "Anuluj",
"common.connect": "Połącz",
"common.disconnect": "Rozłącz",
+ "common.continue": "Prześlij",
"common.submit": "Prześlij",
"common.save": "Zapisz",
"common.saving": "Zapisywanie...",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index e1abb6e6cf..684d5deecd 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -220,6 +220,7 @@ export const dict = {
"common.cancel": "Отмена",
"common.connect": "Подключить",
"common.disconnect": "Отключить",
+ "common.continue": "Отправить",
"common.submit": "Отправить",
"common.save": "Сохранить",
"common.saving": "Сохранение...",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index b522e4631b..80f0da94ec 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -220,6 +220,7 @@ export const dict = {
"common.cancel": "ยกเลิก",
"common.connect": "เชื่อมต่อ",
"common.disconnect": "ยกเลิกการเชื่อมต่อ",
+ "common.continue": "ส่ง",
"common.submit": "ส่ง",
"common.save": "บันทึก",
"common.saving": "กำลังบันทึก...",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index 8542dff799..9041e0dd07 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -225,6 +225,7 @@ export const dict = {
"common.cancel": "İptal",
"common.connect": "Bağlan",
"common.disconnect": "Bağlantı Kes",
+ "common.continue": "Gönder",
"common.submit": "Gönder",
"common.save": "Kaydet",
"common.saving": "Kaydediliyor...",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index e762ba78d9..cf64ca9b2c 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -242,6 +242,7 @@ export const dict = {
"common.cancel": "取消",
"common.connect": "连接",
"common.disconnect": "断开连接",
+ "common.continue": "提交",
"common.submit": "提交",
"common.save": "保存",
"common.saving": "保存中...",
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 184c789ce3..02c00d17a2 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -220,6 +220,7 @@ export const dict = {
"common.cancel": "取消",
"common.connect": "連線",
"common.disconnect": "中斷連線",
+ "common.continue": "提交",
"common.submit": "提交",
"common.save": "儲存",
"common.saving": "儲存中...",
diff --git a/packages/app/src/pages/directory-layout.tsx b/packages/app/src/pages/directory-layout.tsx
index f993ffcd89..cd5e079a69 100644
--- a/packages/app/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
@@ -1,16 +1,15 @@
-import { batch, createEffect, createMemo, Show, type ParentProps } from "solid-js"
-import { createStore } from "solid-js/store"
+import { DataProvider } from "@opencode-ai/ui/context"
+import { showToast } from "@opencode-ai/ui/toast"
+import { base64Encode } from "@opencode-ai/util/encode"
import { useLocation, useNavigate, useParams } from "@solidjs/router"
+import { createMemo, createResource, type ParentProps, Show } from "solid-js"
+import { useGlobalSDK } from "@/context/global-sdk"
+import { useLanguage } from "@/context/language"
+import { LocalProvider } from "@/context/local"
import { SDKProvider } from "@/context/sdk"
import { SyncProvider, useSync } from "@/context/sync"
-import { LocalProvider } from "@/context/local"
-import { useGlobalSDK } from "@/context/global-sdk"
-
-import { DataProvider } from "@opencode-ai/ui/context"
-import { base64Encode } from "@opencode-ai/util/encode"
import { decode64 } from "@/utils/base64"
-import { showToast } from "@opencode-ai/ui/toast"
-import { useLanguage } from "@/context/language"
+
function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
const navigate = useNavigate()
const sync = useSync()
@@ -30,57 +29,53 @@ function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
export default function Layout(props: ParentProps) {
const params = useParams()
- const navigate = useNavigate()
const location = useLocation()
const language = useLanguage()
const globalSDK = useGlobalSDK()
- const directory = createMemo(() => decode64(params.dir) ?? "")
- const [state, setState] = createStore({ invalid: "", resolved: "" })
+ const navigate = useNavigate()
+ let invalid = ""
- createEffect(() => {
- if (!params.dir) return
- const raw = directory()
- if (!raw) {
- if (state.invalid === params.dir) return
- setState("invalid", params.dir)
- showToast({
- variant: "error",
- title: language.t("common.requestFailed"),
- description: language.t("directory.error.invalidUrl"),
- })
- navigate("/", { replace: true })
- return
- }
+ const [resolved] = createResource(
+ () => {
+ if (params.dir) return [location.pathname, params.dir] as const
+ },
+ async ([pathname, b64Dir]) => {
+ const directory = decode64(b64Dir)
- const current = params.dir
- globalSDK
- .createClient({
- directory: raw,
- throwOnError: true,
- })
- .path.get()
- .then((x) => {
- if (params.dir !== current) return
- const next = x.data?.directory ?? raw
- batch(() => {
- setState("invalid", "")
- setState("resolved", next)
+ if (!directory) {
+ if (invalid === params.dir) return
+ invalid = b64Dir
+ showToast({
+ variant: "error",
+ title: language.t("common.requestFailed"),
+ description: language.t("directory.error.invalidUrl"),
})
- if (next === raw) return
- const path = location.pathname.slice(current.length + 1)
- navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
- })
- .catch(() => {
- if (params.dir !== current) return
- batch(() => {
- setState("invalid", "")
- setState("resolved", raw)
+ navigate("/", { replace: true })
+ return
+ }
+
+ return await globalSDK
+ .createClient({
+ directory,
+ throwOnError: true,
})
- })
- })
+ .path.get()
+ .then((x) => {
+ const next = x.data?.directory ?? directory
+ invalid = ""
+ if (next === directory) return next
+ const path = pathname.slice(b64Dir.length + 1)
+ navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
+ })
+ .catch(() => {
+ invalid = ""
+ return directory
+ })
+ },
+ )
return (
-
+
{(resolved) => (
resolved}>
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 4c3a00dfb5..52ac7c5f37 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -543,13 +543,14 @@ export default function Layout(props: ParentProps) {
const currentProject = createMemo(() => {
const directory = currentDir()
if (!directory) return
+ const key = workspaceKey(directory)
const projects = layout.projects.list()
- const sandbox = projects.find((p) => p.sandboxes?.includes(directory))
+ const sandbox = projects.find((p) => p.sandboxes?.some((item) => workspaceKey(item) === key))
if (sandbox) return sandbox
- const direct = projects.find((p) => p.worktree === directory)
+ const direct = projects.find((p) => workspaceKey(p.worktree) === key)
if (direct) return direct
const [child] = globalSync.child(directory, { bootstrap: false })
@@ -630,7 +631,11 @@ export default function Layout(props: ParentProps) {
const projects = layout.projects.list()
for (const [directory, expanded] of Object.entries(store.workspaceExpanded)) {
if (!expanded) continue
- const project = projects.find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
+ const key = workspaceKey(directory)
+ const project = projects.find(
+ (item) =>
+ workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
+ )
if (!project) continue
if (project.vcs === "git" && layout.sidebar.workspaces(project.worktree)()) continue
setStore("workspaceExpanded", directory, false)
@@ -1155,13 +1160,17 @@ export default function Layout(props: ParentProps) {
}
function projectRoot(directory: string) {
+ const key = workspaceKey(directory)
const project = layout.projects
.list()
- .find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
+ .find(
+ (item) =>
+ workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
+ )
if (project) return project.worktree
const known = Object.entries(store.workspaceOrder).find(
- ([root, dirs]) => root === directory || dirs.includes(directory),
+ ([root, dirs]) => workspaceKey(root) === key || dirs.some((item) => workspaceKey(item) === key),
)
if (known) return known[0]
@@ -1177,13 +1186,6 @@ export default function Layout(props: ParentProps) {
return currentProject()?.worktree ?? projectRoot(directory)
}
- function touchProjectRoute() {
- const root = currentProject()?.worktree
- if (!root) return
- if (server.projects.last() !== root) server.projects.touch(root)
- return root
- }
-
function rememberSessionRoute(directory: string, id: string, root = activeProjectRoot(directory)) {
setStore("lastProjectSession", root, { directory, id, at: Date.now() })
return root
@@ -1347,8 +1349,9 @@ export default function Layout(props: ParentProps) {
function closeProject(directory: string) {
const list = layout.projects.list()
- const index = list.findIndex((x) => x.worktree === directory)
- const active = currentProject()?.worktree === directory
+ const key = workspaceKey(directory)
+ const index = list.findIndex((x) => workspaceKey(x.worktree) === key)
+ const active = workspaceKey(currentProject()?.worktree ?? "") === key
if (index === -1) return
const next = list[index + 1]
@@ -1683,38 +1686,55 @@ export default function Layout(props: ParentProps) {
const activeRoute = {
session: "",
sessionProject: "",
+ directory: "",
}
createEffect(
on(
- () => [pageReady(), params.dir, params.id, currentProject()?.worktree] as const,
- ([ready, dir, id]) => {
- if (!ready || !dir) {
+ () => {
+ const dir = params.dir
+ const directory = dir ? decode64(dir) : undefined
+ const resolved = directory ? globalSync.child(directory, { bootstrap: false })[0].path.directory : ""
+ return [pageReady(), dir, params.id, currentProject()?.worktree, directory, resolved] as const
+ },
+ ([ready, dir, id, root, directory, resolved]) => {
+ if (!ready || !dir || !directory) {
activeRoute.session = ""
activeRoute.sessionProject = ""
+ activeRoute.directory = ""
return
}
- const directory = decode64(dir)
- if (!directory) return
-
- const root = touchProjectRoute() ?? activeProjectRoot(directory)
-
if (!id) {
activeRoute.session = ""
activeRoute.sessionProject = ""
+ activeRoute.directory = ""
return
}
+ const next = resolved || directory
const session = `${dir}/${id}`
- if (session !== activeRoute.session) {
+
+ if (!root) {
activeRoute.session = session
- activeRoute.sessionProject = syncSessionRoute(directory, id, root)
+ activeRoute.directory = next
+ activeRoute.sessionProject = ""
+ return
+ }
+
+ if (server.projects.last() !== root) server.projects.touch(root)
+
+ const changed = session !== activeRoute.session || next !== activeRoute.directory
+ if (changed) {
+ activeRoute.session = session
+ activeRoute.directory = next
+ activeRoute.sessionProject = syncSessionRoute(next, id, root)
return
}
if (root === activeRoute.sessionProject) return
- activeRoute.sessionProject = rememberSessionRoute(directory, id, root)
+ activeRoute.directory = next
+ activeRoute.sessionProject = rememberSessionRoute(next, id, root)
},
),
)
@@ -1778,8 +1798,13 @@ export default function Layout(props: ParentProps) {
const local = project.worktree
const dirs = [local, ...(project.sandboxes ?? [])]
const active = currentProject()
- const directory = active?.worktree === project.worktree ? currentDir() : undefined
- const extra = directory && directory !== local && !dirs.includes(directory) ? directory : undefined
+ const directory = workspaceKey(active?.worktree ?? "") === workspaceKey(project.worktree) ? currentDir() : undefined
+ const extra =
+ directory &&
+ workspaceKey(directory) !== workspaceKey(local) &&
+ !dirs.some((item) => workspaceKey(item) === workspaceKey(directory))
+ ? directory
+ : undefined
const pending = extra ? WorktreeState.get(extra)?.status === "pending" : false
const ordered = effectiveWorkspaceOrder(local, dirs, store.workspaceOrder[project.worktree])
diff --git a/packages/app/src/pages/layout/helpers.test.ts b/packages/app/src/pages/layout/helpers.test.ts
index 9dbc6c72d2..1fe52d47a0 100644
--- a/packages/app/src/pages/layout/helpers.test.ts
+++ b/packages/app/src/pages/layout/helpers.test.ts
@@ -104,14 +104,14 @@ describe("layout deep links", () => {
describe("layout workspace helpers", () => {
test("normalizes trailing slash in workspace key", () => {
expect(workspaceKey("/tmp/demo///")).toBe("/tmp/demo")
- expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:\\tmp\\demo")
+ expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:/tmp/demo")
})
test("preserves posix and drive roots in workspace key", () => {
expect(workspaceKey("/")).toBe("/")
expect(workspaceKey("///")).toBe("/")
- expect(workspaceKey("C:\\")).toBe("C:\\")
- expect(workspaceKey("C:\\\\\\")).toBe("C:\\")
+ expect(workspaceKey("C:\\")).toBe("C:/")
+ expect(workspaceKey("C://")).toBe("C:/")
expect(workspaceKey("C:///")).toBe("C:/")
})
diff --git a/packages/app/src/pages/layout/helpers.ts b/packages/app/src/pages/layout/helpers.ts
index be4ce9f574..209cff8a7c 100644
--- a/packages/app/src/pages/layout/helpers.ts
+++ b/packages/app/src/pages/layout/helpers.ts
@@ -1,11 +1,17 @@
import { getFilename } from "@opencode-ai/util/path"
import { type Session } from "@opencode-ai/sdk/v2/client"
+type SessionStore = {
+ session?: Session[]
+ path: { directory: string }
+}
+
export const workspaceKey = (directory: string) => {
- const drive = directory.match(/^([A-Za-z]:)[\\/]+$/)
- if (drive) return `${drive[1]}${directory.includes("\\") ? "\\" : "/"}`
- if (/^[\\/]+$/.test(directory)) return directory.includes("\\") ? "\\" : "/"
- return directory.replace(/[\\/]+$/, "")
+ const value = directory.replaceAll("\\", "/")
+ const drive = value.match(/^([A-Za-z]:)\/+$/)
+ if (drive) return `${drive[1]}/`
+ if (/^\/+$/i.test(value)) return "/"
+ return value.replace(/\/+$/, "")
}
function sortSessions(now: number) {
@@ -25,13 +31,13 @@ function sortSessions(now: number) {
const isRootVisibleSession = (session: Session, directory: string) =>
workspaceKey(session.directory) === workspaceKey(directory) && !session.parentID && !session.time?.archived
-export const sortedRootSessions = (store: { session: Session[]; path: { directory: string } }, now: number) =>
- store.session.filter((session) => isRootVisibleSession(session, store.path.directory)).sort(sortSessions(now))
+const roots = (store: SessionStore) =>
+ (store.session ?? []).filter((session) => isRootVisibleSession(session, store.path.directory))
-export const latestRootSession = (stores: { session: Session[]; path: { directory: string } }[], now: number) =>
- stores
- .flatMap((store) => store.session.filter((session) => isRootVisibleSession(session, store.path.directory)))
- .sort(sortSessions(now))[0]
+export const sortedRootSessions = (store: SessionStore, now: number) => roots(store).sort(sortSessions(now))
+
+export const latestRootSession = (stores: SessionStore[], now: number) =>
+ stores.flatMap(roots).sort(sortSessions(now))[0]
export function hasProjectPermissions(
request: Record,
@@ -40,9 +46,9 @@ export function hasProjectPermissions(
return Object.values(request).some((list) => list?.some(include))
}
-export const childMapByParent = (sessions: Session[]) => {
+export const childMapByParent = (sessions: Session[] | undefined) => {
const map = new Map()
- for (const session of sessions) {
+ for (const session of sessions ?? []) {
if (!session.parentID) continue
const existing = map.get(session.parentID)
if (existing) {
diff --git a/packages/app/src/pages/layout/sidebar-workspace.tsx b/packages/app/src/pages/layout/sidebar-workspace.tsx
index 86ede774e6..127626febe 100644
--- a/packages/app/src/pages/layout/sidebar-workspace.tsx
+++ b/packages/app/src/pages/layout/sidebar-workspace.tsx
@@ -332,12 +332,13 @@ export const SortableWorkspace = (props: {
const open = createMemo(() => props.ctx.workspaceExpanded(props.directory, local()))
const boot = createMemo(() => open() || active())
const booted = createMemo((prev) => prev || workspaceStore.status === "complete", false)
- const hasMore = createMemo(() => workspaceStore.sessionTotal > sessions().length)
+ const count = createMemo(() => sessions()?.length ?? 0)
+ const hasMore = createMemo(() => workspaceStore.sessionTotal > count())
const busy = createMemo(() => props.ctx.isBusy(props.directory))
const wasBusy = createMemo((prev) => prev || busy(), false)
- const loading = createMemo(() => open() && !booted() && sessions().length === 0 && !wasBusy())
+ const loading = createMemo(() => open() && !booted() && count() === 0 && !wasBusy())
const touch = createMediaQuery("(hover: none)")
- const showNew = createMemo(() => !loading() && (touch() || sessions().length === 0 || (active() && !params.id)))
+ const showNew = createMemo(() => !loading() && (touch() || count() === 0 || (active() && !params.id)))
const loadMore = async () => {
setWorkspaceStore("limit", (limit) => (limit ?? 0) + 5)
await globalSync.project.loadSessions(props.directory)
@@ -472,8 +473,9 @@ export const LocalWorkspace = (props: {
const sessions = createMemo(() => sortedRootSessions(workspace().store, props.sortNow()))
const children = createMemo(() => childMapByParent(workspace().store.session))
const booted = createMemo((prev) => prev || workspace().store.status === "complete", false)
- const loading = createMemo(() => !booted() && sessions().length === 0)
- const hasMore = createMemo(() => workspace().store.sessionTotal > sessions().length)
+ const count = createMemo(() => sessions()?.length ?? 0)
+ const loading = createMemo(() => !booted() && count() === 0)
+ const hasMore = createMemo(() => workspace().store.sessionTotal > count())
const loadMore = async () => {
workspace().setStore("limit", (limit) => (limit ?? 0) + 5)
await globalSync.project.loadSessions(props.project.worktree)
diff --git a/packages/app/src/pages/session/terminal-panel.tsx b/packages/app/src/pages/session/terminal-panel.tsx
index d62d91c197..c663d7d671 100644
--- a/packages/app/src/pages/session/terminal-panel.tsx
+++ b/packages/app/src/pages/session/terminal-panel.tsx
@@ -280,21 +280,24 @@ export function TerminalPanel() {
- {(id) => (
- pty.id === id)}>
- {(pty) => (
-
- terminal.trim(id)}
- onCleanup={terminal.update}
- onConnectError={() => terminal.clone(id)}
- />
-
- )}
-
- )}
+ {(id) => {
+ const ops = terminal.bind()
+ return (
+ pty.id === id)}>
+ {(pty) => (
+
+ ops.trim(id)}
+ onCleanup={ops.update}
+ onConnectError={() => ops.clone(id)}
+ />
+
+ )}
+
+ )
+ }}
diff --git a/packages/desktop-electron/src/renderer/index.tsx b/packages/desktop-electron/src/renderer/index.tsx
index 6719c04bee..30e882e237 100644
--- a/packages/desktop-electron/src/renderer/index.tsx
+++ b/packages/desktop-electron/src/renderer/index.tsx
@@ -152,12 +152,12 @@ const createPlatform = (): Platform => {
storage,
checkUpdate: async () => {
- if (!UPDATER_ENABLED) return { updateAvailable: false }
+ if (!UPDATER_ENABLED()) return { updateAvailable: false }
return window.api.checkUpdate()
},
update: async () => {
- if (!UPDATER_ENABLED) return
+ if (!UPDATER_ENABLED()) return
await window.api.installUpdate()
},
diff --git a/packages/desktop-electron/src/renderer/updater.ts b/packages/desktop-electron/src/renderer/updater.ts
index fe9e601db8..ba2b458ece 100644
--- a/packages/desktop-electron/src/renderer/updater.ts
+++ b/packages/desktop-electron/src/renderer/updater.ts
@@ -1,6 +1,6 @@
import { initI18n, t } from "./i18n"
-export const UPDATER_ENABLED = window.__OPENCODE__?.updaterEnabled ?? false
+export const UPDATER_ENABLED = () => window.__OPENCODE__?.updaterEnabled ?? false
export async function runUpdater({ alertOnFail }: { alertOnFail: boolean }) {
await initI18n()
diff --git a/packages/opencode/src/cli/cmd/providers.ts b/packages/opencode/src/cli/cmd/providers.ts
index a2b7c5be15..581809e90e 100644
--- a/packages/opencode/src/cli/cmd/providers.ts
+++ b/packages/opencode/src/cli/cmd/providers.ts
@@ -349,7 +349,6 @@ export const ProvidersLoginCommand = cmd({
value: x.id,
hint: {
opencode: "recommended",
- anthropic: "API key",
openai: "ChatGPT Plus/Pro or API key",
}[x.id],
})),
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 c85426cc24..249a48d358 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -13,6 +13,7 @@ import { MessageID, PartID } from "@/session/schema"
import { createStore, produce } from "solid-js/store"
import { useKeybind } from "@tui/context/keybind"
import { usePromptHistory, type PromptInfo } from "./history"
+import { assign } from "./part"
import { usePromptStash } from "./stash"
import { DialogStash } from "../dialog-stash"
import { type AutocompleteRef, Autocomplete } from "./autocomplete"
@@ -643,10 +644,7 @@ export function Prompt(props: PromptProps) {
type: "text",
text: inputText,
},
- ...nonTextParts.map((x) => ({
- id: PartID.ascending(),
- ...x,
- })),
+ ...nonTextParts.map(assign),
],
})
.catch(() => {})
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/part.ts b/packages/opencode/src/cli/cmd/tui/component/prompt/part.ts
new file mode 100644
index 0000000000..8cdcef6067
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/part.ts
@@ -0,0 +1,16 @@
+import { PartID } from "@/session/schema"
+import type { PromptInfo } from "./history"
+
+type Item = PromptInfo["parts"][number]
+
+export function strip(part: Item & { id: string; messageID: string; sessionID: string }): Item {
+ const { id: _id, messageID: _messageID, sessionID: _sessionID, ...rest } = part
+ return rest
+}
+
+export function assign(part: Item): Item & { id: PartID } {
+ return {
+ ...part,
+ id: PartID.ascending(),
+ }
+}
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
index 62154cce56..742d51be22 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
@@ -7,6 +7,7 @@ import { useSDK } from "@tui/context/sdk"
import { useRoute } from "@tui/context/route"
import { useDialog } from "../../ui/dialog"
import type { PromptInfo } from "@tui/component/prompt/history"
+import { strip } from "@tui/component/prompt/part"
export function DialogForkFromTimeline(props: { sessionID: string; onMove: (messageID: string) => void }) {
const sync = useSync()
@@ -42,7 +43,7 @@ export function DialogForkFromTimeline(props: { sessionID: string; onMove: (mess
if (part.type === "text") {
if (!part.synthetic) agg.input += part.text
}
- if (part.type === "file") agg.parts.push(part)
+ if (part.type === "file") agg.parts.push(strip(part))
return agg
},
{ input: "", parts: [] as PromptInfo["parts"] },
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 ff17b5567e..a51a6cfe58 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
@@ -5,6 +5,7 @@ import { useSDK } from "@tui/context/sdk"
import { useRoute } from "@tui/context/route"
import { Clipboard } from "@tui/util/clipboard"
import type { PromptInfo } from "@tui/component/prompt/history"
+import { strip } from "@tui/component/prompt/part"
export function DialogMessage(props: {
messageID: string
@@ -40,7 +41,7 @@ export function DialogMessage(props: {
if (part.type === "text") {
if (!part.synthetic) agg.input += part.text
}
- if (part.type === "file") agg.parts.push(part)
+ if (part.type === "file") agg.parts.push(strip(part))
return agg
},
{ input: "", parts: [] as PromptInfo["parts"] },
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index 8790efac49..755ce2c211 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -16,8 +16,6 @@ import { gitlabAuthPlugin as GitlabAuthPlugin } from "@gitlab/opencode-gitlab-au
export namespace Plugin {
const log = Log.create({ service: "plugin" })
- const BUILTIN = ["opencode-anthropic-auth@0.0.13"]
-
// Built-in plugins that are directly imported (not installed from npm)
const INTERNAL_PLUGINS: PluginInstance[] = [CodexAuthPlugin, CopilotAuthPlugin, GitlabAuthPlugin]
@@ -55,9 +53,6 @@ export namespace Plugin {
let plugins = config.plugin ?? []
if (plugins.length) await Config.waitForDependencies()
- if (!Flag.OPENCODE_DISABLE_DEFAULT_PLUGINS) {
- plugins = [...BUILTIN, ...plugins]
- }
for (let plugin of plugins) {
// ignore old codex plugin since it is supported first party now
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
index 0825e13b03..0255cf9bf1 100644
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -150,8 +150,7 @@ export namespace Provider {
autoload: false,
options: {
headers: {
- "anthropic-beta":
- "claude-code-20250219,interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14",
+ "anthropic-beta": "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14",
},
},
}
diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts
index bcf1b3e6af..daf70180e5 100644
--- a/packages/opencode/src/session/llm.ts
+++ b/packages/opencode/src/session/llm.ts
@@ -207,18 +207,12 @@ export namespace LLM {
maxOutputTokens,
abortSignal: input.abort,
headers: {
- ...(input.model.providerID.startsWith("opencode")
- ? {
- "x-opencode-project": Instance.project.id,
- "x-opencode-session": input.sessionID,
- "x-opencode-request": input.user.id,
- "x-opencode-client": Flag.OPENCODE_CLIENT,
- }
- : input.model.providerID !== "anthropic"
- ? {
- "User-Agent": `opencode/${Installation.VERSION}`,
- }
- : undefined),
+ ...(input.model.providerID.startsWith("opencode") && {
+ "x-opencode-project": Instance.project.id,
+ "x-opencode-session": input.sessionID,
+ "x-opencode-request": input.user.id,
+ "x-opencode-client": Flag.OPENCODE_CLIENT,
+ }),
...input.model.headers,
...headers,
},
diff --git a/packages/opencode/src/session/prompt/anthropic-20250930.txt b/packages/opencode/src/session/prompt/anthropic-20250930.txt
deleted file mode 100644
index e15080e6c8..0000000000
--- a/packages/opencode/src/session/prompt/anthropic-20250930.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-You are an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
-
-IMPORTANT: Assist with defensive security tasks only. Refuse to create, modify, or improve code that may be used maliciously. Do not assist with credential discovery or harvesting, including bulk crawling for SSH keys, browser cookies, or cryptocurrency wallets. Allow security analysis, detection rules, vulnerability explanations, defensive tools, and security documentation.
-IMPORTANT: You must NEVER generate or guess URLs for the user unless you are confident that the URLs are for helping the user with programming. You may use URLs provided by the user in their messages or local files.
-
-If the user asks for help or wants to give feedback inform them of the following:
-- /help: Get help with using Claude Code
-- To give feedback, users should report the issue at https://github.com/anthropics/claude-code/issues
-
-When the user directly asks about Claude Code (eg. "can Claude Code do...", "does Claude Code have..."), or asks in second person (eg. "are you able...", "can you do..."), or asks how to use a specific Claude Code feature (eg. implement a hook, or write a slash command), use the WebFetch tool to gather information to answer the question from Claude Code docs. The list of available docs is available at https://docs.claude.com/en/docs/claude-code/claude_code_docs_map.md.
-
-# Tone and style
-You should be concise, direct, and to the point, while providing complete information and matching the level of detail you provide in your response with the level of complexity of the user's query or the work you have completed.
-A concise response is generally less than 4 lines, not including tool calls or code generated. You should provide more detail when the task is complex or when the user asks you to.
-IMPORTANT: You should minimize output tokens as much as possible while maintaining helpfulness, quality, and accuracy. Only address the specific task at hand, avoiding tangential information unless absolutely critical for completing the request. If you can answer in 1-3 sentences or a short paragraph, please do.
-IMPORTANT: You should NOT answer with unnecessary preamble or postamble (such as explaining your code or summarizing your action), unless the user asks you to.
-Do not add additional code explanation summary unless requested by the user. After working on a file, briefly confirm that you have completed the task, rather than providing an explanation of what you did.
-Answer the user's question directly, avoiding any elaboration, explanation, introduction, conclusion, or excessive details. Brief answers are best, but be sure to provide complete information. You MUST avoid extra preamble before/after your response, such as "The answer is
.", "Here is the content of the file..." or "Based on the information provided, the answer is..." or "Here is what I will do next...".
-
-Here are some examples to demonstrate appropriate verbosity:
-
-user: 2 + 2
-assistant: 4
-
-
-
-user: what is 2+2?
-assistant: 4
-
-
-
-user: is 11 a prime number?
-assistant: Yes
-
-
-
-user: what command should I run to list files in the current directory?
-assistant: ls
-
-
-
-user: what command should I run to watch files in the current directory?
-assistant: [runs ls to list the files in the current directory, then read docs/commands in the relevant file to find out how to watch files]
-npm run dev
-
-
-
-user: How many golf balls fit inside a jetta?
-assistant: 150000
-
-
-
-user: what files are in the directory src/?
-assistant: [runs ls and sees foo.c, bar.c, baz.c]
-user: which file contains the implementation of foo?
-assistant: src/foo.c
-
-When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).
-Remember that your output will be displayed on a command line interface. Your responses can use GitHub-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.
-Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
-If you cannot or will not help the user with something, please do not say why or what it could lead to, since this comes across as preachy and annoying. Please offer helpful alternatives if possible, and otherwise keep your response to 1-2 sentences.
-Only use emojis if the user explicitly requests it. Avoid using emojis in all communication unless asked.
-IMPORTANT: Keep your responses short, since they will be displayed on a command line interface.
-
-# Proactiveness
-You are allowed to be proactive, but only when the user asks you to do something. You should strive to strike a balance between:
-- Doing the right thing when asked, including taking actions and follow-up actions
-- Not surprising the user with actions you take without asking
-For example, if the user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
-
-# Professional objectivity
-Prioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving, providing direct, objective technical info without any unnecessary superlatives, praise, or emotional validation. It is best for the user if Claude honestly applies the same rigorous standards to all ideas and disagrees when necessary, even if it may not be what the user wants to hear. Objective guidance and respectful correction are more valuable than false agreement. Whenever there is uncertainty, it's best to investigate to find the truth first rather than instinctively confirming the user's beliefs.
-
-# Task Management
-You have access to the TodoWrite tools to help you manage and plan tasks. Use these tools VERY frequently to ensure that you are tracking your tasks and giving the user visibility into your progress.
-These tools are also EXTREMELY helpful for planning tasks, and for breaking down larger complex tasks into smaller steps. If you do not use this tool when planning, you may forget to do important tasks - and that is unacceptable.
-
-It is critical that you mark todos as completed as soon as you are done with a task. Do not batch up multiple tasks before marking them as completed.
-
-Examples:
-
-
-user: Run the build and fix any type errors
-assistant: I'm going to use the TodoWrite tool to write the following items to the todo list:
-- Run the build
-- Fix any type errors
-
-I'm now going to run the build using Bash.
-
-Looks like I found 10 type errors. I'm going to use the TodoWrite tool to write 10 items to the todo list.
-
-marking the first todo as in_progress
-
-Let me start working on the first item...
-
-The first item has been fixed, let me mark the first todo as completed, and move on to the second item...
-..
-..
-
-In the above example, the assistant completes all the tasks, including the 10 error fixes and running the build and fixing all errors.
-
-
-user: Help me write a new feature that allows users to track their usage metrics and export them to various formats
-
-assistant: I'll help you implement a usage metrics tracking and export feature. Let me first use the TodoWrite tool to plan this task.
-Adding the following todos to the todo list:
-1. Research existing metrics tracking in the codebase
-2. Design the metrics collection system
-3. Implement core metrics tracking functionality
-4. Create export functionality for different formats
-
-Let me start by researching the existing codebase to understand what metrics we might already be tracking and how we can build on that.
-
-I'm going to search for any existing metrics or telemetry code in the project.
-
-I've found some existing telemetry code. Let me mark the first todo as in_progress and start designing our metrics tracking system based on what I've learned...
-
-[Assistant continues implementing the feature step by step, marking todos as in_progress and completed as they go]
-
-
-
-Users may configure 'hooks', shell commands that execute in response to events like tool calls, in settings. Treat feedback from hooks, including , as coming from the user. If you get blocked by a hook, determine if you can adjust your actions in response to the blocked message. If not, ask the user to check their hooks configuration.
-
-# Doing tasks
-The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
-- Use the TodoWrite tool to plan the task if required
-
-- Tool results and user messages may include tags. tags contain useful information and reminders. They are automatically added by the system, and bear no direct relation to the specific tool results or user messages in which they appear.
-
-
-# Tool usage policy
-- When doing file search, prefer to use the Task tool in order to reduce context usage.
-- You should proactively use the Task tool with specialized agents when the task at hand matches the agent's description.
-
-- When WebFetch returns a message about a redirect to a different host, you should immediately make a new WebFetch request with the redirect URL provided in the response.
-- You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. When making multiple bash tool calls, you MUST send a single message with multiple tools calls to run the calls in parallel. For example, if you need to run "git status" and "git diff", send a single message with two tool calls to run the calls in parallel.
-- If the user specifies that they want you to run tools "in parallel", you MUST send a single message with multiple tool use content blocks. For example, if you need to launch multiple agents in parallel, send a single message with multiple Task tool calls.
-- Use specialized tools instead of bash commands when possible, as this provides a better user experience. For file operations, use dedicated tools: Read for reading files instead of cat/head/tail, Edit for editing instead of sed/awk, and Write for creating files instead of cat with heredoc or echo redirection. Reserve bash tools exclusively for actual system commands and terminal operations that require shell execution. NEVER use bash echo or other command-line tools to communicate thoughts, explanations, or instructions to the user. Output all communication directly in your response text instead.
-
-
-Here is useful information about the environment you are running in:
-
-Working directory: /home/thdxr/dev/projects/anomalyco/opencode/packages/opencode
-Is directory a git repo: Yes
-Platform: linux
-OS Version: Linux 6.12.4-arch1-1
-Today's date: 2025-09-30
-
-You are powered by the model named Sonnet 4.5. The exact model ID is claude-sonnet-4-5-20250929.
-
-Assistant knowledge cutoff is January 2025.
-
-
-IMPORTANT: Assist with defensive security tasks only. Refuse to create, modify, or improve code that may be used maliciously. Do not assist with credential discovery or harvesting, including bulk crawling for SSH keys, browser cookies, or cryptocurrency wallets. Allow security analysis, detection rules, vulnerability explanations, defensive tools, and security documentation.
-
-
-IMPORTANT: Always use the TodoWrite tool to plan and track tasks throughout the conversation.
-
-# Code References
-
-When referencing specific functions or pieces of code include the pattern `file_path:line_number` to allow the user to easily navigate to the source code location.
-
-
-user: Where are errors from the client handled?
-assistant: Clients are marked as failed in the `connectToServer` function in src/services/process.ts:712.
-
diff --git a/packages/opencode/test/cli/cmd/tui/prompt-part.test.ts b/packages/opencode/test/cli/cmd/tui/prompt-part.test.ts
new file mode 100644
index 0000000000..326d3e624d
--- /dev/null
+++ b/packages/opencode/test/cli/cmd/tui/prompt-part.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, test } from "bun:test"
+import type { PromptInfo } from "../../../../src/cli/cmd/tui/component/prompt/history"
+import { assign, strip } from "../../../../src/cli/cmd/tui/component/prompt/part"
+
+describe("prompt part", () => {
+ test("strip removes persisted ids from reused file parts", () => {
+ const part = {
+ id: "prt_old",
+ sessionID: "ses_old",
+ messageID: "msg_old",
+ type: "file" as const,
+ mime: "image/png",
+ filename: "tiny.png",
+ url: "data:image/png;base64,abc",
+ }
+
+ expect(strip(part)).toEqual({
+ type: "file",
+ mime: "image/png",
+ filename: "tiny.png",
+ url: "data:image/png;base64,abc",
+ })
+ })
+
+ test("assign overwrites stale runtime ids", () => {
+ const part = {
+ id: "prt_old",
+ sessionID: "ses_old",
+ messageID: "msg_old",
+ type: "file" as const,
+ mime: "image/png",
+ filename: "tiny.png",
+ url: "data:image/png;base64,abc",
+ } as PromptInfo["parts"][number]
+
+ const next = assign(part)
+
+ expect(next.id).not.toBe("prt_old")
+ expect(next.id.startsWith("prt_")).toBe(true)
+ expect(next).toMatchObject({
+ type: "file",
+ mime: "image/png",
+ filename: "tiny.png",
+ url: "data:image/png;base64,abc",
+ })
+ })
+})
diff --git a/packages/web/src/content/docs/providers.mdx b/packages/web/src/content/docs/providers.mdx
index 7f99320519..0c0ba30a08 100644
--- a/packages/web/src/content/docs/providers.mdx
+++ b/packages/web/src/content/docs/providers.mdx
@@ -307,8 +307,6 @@ For custom inference profiles, use the model and provider name in the key and se
```txt
┌ Select auth method
│
- │ Claude Pro/Max
- │ Create an API Key
│ Manually enter API Key
└
```
@@ -320,14 +318,19 @@ For custom inference profiles, use the model and provider name in the key and se
```
:::info
-Using your Claude Pro/Max subscription in OpenCode is not officially supported by [Anthropic](https://anthropic.com).
-:::
+There are plugins that allow you to use your Claude Pro/Max models with
+OpenCode. Anthropic explicitly prohibits this.
-##### Using API keys
+Previous versions of OpenCode came bundled with these plugins but that is no
+longer the case as of 1.3.0
-You can also select **Create an API Key** if you don't have a Pro/Max subscription. It'll also open your browser and ask you to login to Anthropic and give you a code you can paste in your terminal.
+Other companies support freedom of choice with developer tooling - you can use
+the following subscriptions in OpenCode with zero setup:
-Or if you already have an API key, you can select **Manually enter API Key** and paste it in your terminal.
+- ChatGPT Plus
+- Github Copilot
+- Gitlab Duo
+ :::
---