Connect provider
@@ -515,7 +522,7 @@ export default function Layout(props: ParentProps) {
class="flex w-full text-left justify-start text-12-medium text-text-base stroke-[1.5px] rounded-lg px-2"
variant="ghost"
size="large"
- icon="plus-small"
+ icon="plus"
onClick={connectProvider}
>
Connect provider
diff --git a/packages/desktop/src/pages/session.tsx b/packages/desktop/src/pages/session.tsx
index 5dae4ce55..8ea9f87e1 100644
--- a/packages/desktop/src/pages/session.tsx
+++ b/packages/desktop/src/pages/session.tsx
@@ -675,7 +675,7 @@ export default function Page() {
{(terminal) => }
-
+
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index 637d9cc0b..f265b3b27 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/enterprise",
- "version": "1.0.150",
+ "version": "1.0.152",
"private": true,
"type": "module",
"scripts": {
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index e7cb19deb..649233b99 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.150"
+version = "1.0.152"
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.150/opencode-darwin-arm64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.152/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.150/opencode-darwin-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.152/opencode-darwin-x64.zip"
cmd = "./opencode"
args = ["acp"]
[agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/sst/opencode/releases/download/v1.0.150/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.152/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.150/opencode-linux-x64.tar.gz"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.152/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.150/opencode-windows-x64.zip"
+archive = "https://github.com/sst/opencode/releases/download/v1.0.152/opencode-windows-x64.zip"
cmd = "./opencode.exe"
args = ["acp"]
diff --git a/packages/function/package.json b/packages/function/package.json
index 591dcfb3c..42baa2787 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/function",
- "version": "1.0.150",
+ "version": "1.0.152",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 972568983..362f5b1f2 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.150",
+ "version": "1.0.152",
"name": "opencode",
"type": "module",
"private": true,
diff --git a/packages/opencode/src/acp/agent.ts b/packages/opencode/src/acp/agent.ts
index a1e45e1d2..d20c971eb 100644
--- a/packages/opencode/src/acp/agent.ts
+++ b/packages/opencode/src/acp/agent.ts
@@ -914,6 +914,8 @@ export namespace ACP {
{
sessionID,
directory,
+ providerID: model.providerID,
+ modelID: model.modelID,
},
{ throwOnError: true },
)
diff --git a/packages/opencode/src/cli/cmd/tui/component/logo.tsx b/packages/opencode/src/cli/cmd/tui/component/logo.tsx
index 4f5121596..d1be06a7f 100644
--- a/packages/opencode/src/cli/cmd/tui/component/logo.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/logo.tsx
@@ -1,4 +1,3 @@
-import { Installation } from "@/installation"
import { TextAttributes } from "@opentui/core"
import { For } from "solid-js"
import { useTheme } from "@tui/context/theme"
@@ -14,8 +13,10 @@ export function Logo() {
{(line, index) => (
- {line}
-
+
+ {line}
+
+
{LOGO_RIGHT[index()]}
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 669ed1897..1ea701c83 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -732,8 +732,12 @@ export function Prompt(props: PromptProps) {
return
}
if (keybind.match("app_exit", e)) {
- await exit()
- return
+ if (store.prompt.input === "") {
+ await exit()
+ // Don't preventDefault - let textarea potentially handle the event
+ e.preventDefault()
+ return
+ }
}
if (e.name === "!" && input.visualCursor.offset === 0) {
setStore("mode", "shell")
diff --git a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
index c62630e0c..398aff5af 100644
--- a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
+++ b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
@@ -61,7 +61,7 @@ export namespace Clipboard {
const getCopyMethod = lazy(() => {
const os = platform()
- if (os === "darwin" && Bun.which("oascript")) {
+ if (os === "darwin" && Bun.which("osascript")) {
console.log("clipboard: using osascript")
return async (text: string) => {
const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"')
diff --git a/packages/opencode/src/flag/flag.ts b/packages/opencode/src/flag/flag.ts
index 2dcf112ae..c4a03e831 100644
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -1,5 +1,6 @@
export namespace Flag {
export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE")
+ export const OPENCODE_GIT_BASH_PATH = process.env["OPENCODE_GIT_BASH_PATH"]
export const OPENCODE_CONFIG = process.env["OPENCODE_CONFIG"]
export const OPENCODE_CONFIG_DIR = process.env["OPENCODE_CONFIG_DIR"]
export const OPENCODE_CONFIG_CONTENT = process.env["OPENCODE_CONFIG_CONTENT"]
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index c0ee45236..1c4fa39c8 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -255,7 +255,7 @@ export namespace ProviderTransform {
result["reasoningEffort"] = "medium"
}
- if (model.api.id.endsWith("gpt-5.1") && model.providerID !== "azure") {
+ if (model.api.id.endsWith("gpt-5.") && model.providerID !== "azure") {
result["textVerbosity"] = "low"
}
@@ -272,7 +272,7 @@ export namespace ProviderTransform {
const options: Record = {}
if (model.providerID === "openai" || model.api.id.includes("gpt-5")) {
- if (model.api.id.includes("5.1")) {
+ if (model.api.id.includes("5.")) {
options["reasoningEffort"] = "low"
} else {
options["reasoningEffort"] = "minimal"
diff --git a/packages/opencode/src/pty/index.ts b/packages/opencode/src/pty/index.ts
index 34323371b..d192eaf1f 100644
--- a/packages/opencode/src/pty/index.ts
+++ b/packages/opencode/src/pty/index.ts
@@ -6,10 +6,10 @@ import { Identifier } from "../id/id"
import { Log } from "../util/log"
import type { WSContext } from "hono/ws"
import { Instance } from "../project/instance"
-import { shell } from "@opencode-ai/util/shell"
import { lazy } from "@opencode-ai/util/lazy"
import {} from "process"
import { Installation } from "@/installation"
+import { Shell } from "@/shell/shell"
export namespace Pty {
const log = Log.create({ service: "pty" })
@@ -112,7 +112,7 @@ export namespace Pty {
export async function create(input: CreateInput) {
const id = Identifier.create("pty", false)
- const command = input.command || shell()
+ const command = input.command || Shell.preferred()
const args = input.args || []
const cwd = input.cwd || Instance.directory
const env = { ...process.env, ...input.env } as Record
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 7f1b03c94..c9e24f8ca 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -50,6 +50,7 @@ import { fn } from "@/util/fn"
import { SessionProcessor } from "./processor"
import { TaskTool } from "@/tool/task"
import { SessionStatus } from "./status"
+import { Shell } from "@/shell/shell"
// @ts-ignore
globalThis.AI_SDK_LOG_WARNINGS = false
@@ -1172,6 +1173,12 @@ export namespace SessionPrompt {
})
export type ShellInput = z.infer
export async function shell(input: ShellInput) {
+ const abort = start(input.sessionID)
+ if (!abort) {
+ throw new Session.BusyError(input.sessionID)
+ }
+ using _ = defer(() => cancel(input.sessionID))
+
const session = await Session.get(input.sessionID)
if (session.revert) {
SessionRevert.cleanup(session)
@@ -1244,8 +1251,10 @@ export namespace SessionPrompt {
},
}
await Session.updatePart(part)
- const shell = process.env["SHELL"] ?? (process.platform === "win32" ? process.env["COMSPEC"] || "cmd.exe" : "bash")
- const shellName = path.basename(shell).toLowerCase()
+ const shell = Shell.preferred()
+ const shellName = (
+ process.platform === "win32" ? path.win32.basename(shell, ".exe") : path.basename(shell)
+ ).toLowerCase()
const invocations: Record = {
nu: {
@@ -1275,17 +1284,21 @@ export namespace SessionPrompt {
`,
],
},
- // Windows cmd.exe
- "cmd.exe": {
+ // Windows cmd
+ cmd: {
args: ["/c", input.command],
},
// Windows PowerShell
- "powershell.exe": {
+ powershell: {
+ args: ["-NoProfile", "-Command", input.command],
+ },
+ pwsh: {
args: ["-NoProfile", "-Command", input.command],
},
// Fallback: any shell that doesn't match those above
+ // - No -l, for max compatibility
"": {
- args: ["-c", "-l", `${input.command}`],
+ args: ["-c", `${input.command}`],
},
}
@@ -1326,11 +1339,34 @@ export namespace SessionPrompt {
}
})
+ let aborted = false
+ let exited = false
+
+ const kill = () => Shell.killTree(proc, { exited: () => exited })
+
+ if (abort.aborted) {
+ aborted = true
+ await kill()
+ }
+
+ const abortHandler = () => {
+ aborted = true
+ void kill()
+ }
+
+ abort.addEventListener("abort", abortHandler, { once: true })
+
await new Promise((resolve) => {
proc.on("close", () => {
+ exited = true
+ abort.removeEventListener("abort", abortHandler)
resolve()
})
})
+
+ if (aborted) {
+ output += "\n\n" + ["", "User aborted the command", ""].join("\n")
+ }
msg.time.completed = Date.now()
await Session.updateMessage(msg)
if (part.state.status === "running") {
diff --git a/packages/opencode/src/session/summary.ts b/packages/opencode/src/session/summary.ts
index ab6a98686..4761c9d2f 100644
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -130,10 +130,7 @@ export namespace SessionSummary {
m.info.role === "assistant" && m.parts.some((p) => p.type === "step-finish" && p.reason !== "tool-calls"),
)
) {
- let summary = messages
- .findLast((m) => m.info.role === "assistant")
- ?.parts.findLast((p) => p.type === "text")?.text
- if (!summary || diffs.length > 0) {
+ if (diffs.length > 0) {
for (const msg of messages) {
for (const part of msg.parts) {
if (part.type === "tool" && part.state.status === "completed") {
@@ -167,10 +164,10 @@ export namespace SessionSummary {
},
},
}).catch(() => {})
- if (result) summary = result.text
+ if (result) {
+ userMsg.summary.body = result.text
+ }
}
- userMsg.summary.body = summary
- log.info("body", { body: summary })
await Session.updateMessage(userMsg)
}
}
diff --git a/packages/opencode/src/shell/shell.ts b/packages/opencode/src/shell/shell.ts
new file mode 100644
index 000000000..2e8d48bfd
--- /dev/null
+++ b/packages/opencode/src/shell/shell.ts
@@ -0,0 +1,67 @@
+import { Flag } from "@/flag/flag"
+import { lazy } from "@/util/lazy"
+import path from "path"
+import { spawn, type ChildProcess } from "child_process"
+
+const SIGKILL_TIMEOUT_MS = 200
+
+export namespace Shell {
+ export async function killTree(proc: ChildProcess, opts?: { exited?: () => boolean }): Promise {
+ const pid = proc.pid
+ if (!pid || opts?.exited?.()) return
+
+ if (process.platform === "win32") {
+ await new Promise((resolve) => {
+ const killer = spawn("taskkill", ["/pid", String(pid), "/f", "/t"], { stdio: "ignore" })
+ killer.once("exit", () => resolve())
+ killer.once("error", () => resolve())
+ })
+ return
+ }
+
+ try {
+ process.kill(-pid, "SIGTERM")
+ await Bun.sleep(SIGKILL_TIMEOUT_MS)
+ if (!opts?.exited?.()) {
+ process.kill(-pid, "SIGKILL")
+ }
+ } catch (_e) {
+ proc.kill("SIGTERM")
+ await Bun.sleep(SIGKILL_TIMEOUT_MS)
+ if (!opts?.exited?.()) {
+ proc.kill("SIGKILL")
+ }
+ }
+ }
+ const BLACKLIST = new Set(["fish", "nu"])
+
+ function fallback() {
+ if (process.platform === "win32") {
+ if (Flag.OPENCODE_GIT_BASH_PATH) return Flag.OPENCODE_GIT_BASH_PATH
+ const git = Bun.which("git")
+ if (git) {
+ // git.exe is typically at: C:\Program Files\Git\cmd\git.exe
+ // bash.exe is at: C:\Program Files\Git\bin\bash.exe
+ const bash = path.join(git, "..", "..", "bin", "bash.exe")
+ if (Bun.file(bash).size) return bash
+ }
+ return process.env.COMSPEC || "cmd.exe"
+ }
+ if (process.platform === "darwin") return "/bin/zsh"
+ const bash = Bun.which("bash")
+ if (bash) return bash
+ return "/bin/sh"
+ }
+
+ export const preferred = lazy(() => {
+ const s = process.env.SHELL
+ if (s) return s
+ return fallback()
+ })
+
+ export const acceptable = lazy(() => {
+ const s = process.env.SHELL
+ if (s && !BLACKLIST.has(process.platform === "win32" ? path.win32.basename(s) : path.basename(s))) return s
+ return fallback()
+ })
+}
diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index 533f3372e..a165e88ab 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -14,11 +14,10 @@ import { Permission } from "@/permission"
import { fileURLToPath } from "url"
import { Flag } from "@/flag/flag.ts"
import path from "path"
-import { iife } from "@/util/iife"
+import { Shell } from "@/shell/shell"
const MAX_OUTPUT_LENGTH = Flag.OPENCODE_EXPERIMENTAL_BASH_MAX_OUTPUT_LENGTH || 30_000
const DEFAULT_TIMEOUT = Flag.OPENCODE_EXPERIMENTAL_BASH_DEFAULT_TIMEOUT_MS || 2 * 60 * 1000
-const SIGKILL_TIMEOUT_MS = 200
export const log = Log.create({ service: "bash-tool" })
@@ -53,32 +52,7 @@ const parser = lazy(async () => {
// TODO: we may wanna rename this tool so it works better on other shells
export const BashTool = Tool.define("bash", async () => {
- const shell = iife(() => {
- const s = process.env.SHELL
- if (s) {
- const basename = path.basename(s)
- if (!new Set(["fish", "nu"]).has(basename)) {
- return s
- }
- }
-
- if (process.platform === "darwin") {
- return "/bin/zsh"
- }
-
- if (process.platform === "win32") {
- // Let Bun / Node pick COMSPEC (usually cmd.exe)
- // or explicitly:
- return process.env.COMSPEC || true
- }
-
- const bash = Bun.which("bash")
- if (bash) {
- return bash
- }
-
- return true
- })
+ const shell = Shell.acceptable()
log.info("bash tool using shell", { shell })
return {
@@ -261,51 +235,23 @@ export const BashTool = Tool.define("bash", async () => {
let aborted = false
let exited = false
- const killTree = async () => {
- const pid = proc.pid
- if (!pid || exited) {
- return
- }
-
- if (process.platform === "win32") {
- await new Promise((resolve) => {
- const killer = spawn("taskkill", ["/pid", String(pid), "/f", "/t"], { stdio: "ignore" })
- killer.once("exit", resolve)
- killer.once("error", resolve)
- })
- return
- }
-
- try {
- process.kill(-pid, "SIGTERM")
- await Bun.sleep(SIGKILL_TIMEOUT_MS)
- if (!exited) {
- process.kill(-pid, "SIGKILL")
- }
- } catch (_e) {
- proc.kill("SIGTERM")
- await Bun.sleep(SIGKILL_TIMEOUT_MS)
- if (!exited) {
- proc.kill("SIGKILL")
- }
- }
- }
+ const kill = () => Shell.killTree(proc, { exited: () => exited })
if (ctx.abort.aborted) {
aborted = true
- await killTree()
+ await kill()
}
const abortHandler = () => {
aborted = true
- void killTree()
+ void kill()
}
ctx.abort.addEventListener("abort", abortHandler, { once: true })
const timeoutTimer = setTimeout(() => {
timedOut = true
- void killTree()
+ void kill()
}, timeout + 100)
await new Promise((resolve, reject) => {
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 3256079a5..815bbd9e1 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.150",
+ "version": "1.0.152",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
@@ -24,4 +24,4 @@
"typescript": "catalog:",
"@typescript/native-preview": "catalog:"
}
-}
+}
\ No newline at end of file
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 0ff29129e..7d1b3fc4d 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.150",
+ "version": "1.0.152",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
@@ -29,4 +29,4 @@
"publishConfig": {
"directory": "dist"
}
-}
+}
\ No newline at end of file
diff --git a/packages/slack/package.json b/packages/slack/package.json
index ab046fc40..925602f9a 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/slack",
- "version": "1.0.150",
+ "version": "1.0.152",
"type": "module",
"scripts": {
"dev": "bun run src/index.ts",
diff --git a/packages/tauri/index.html b/packages/tauri/index.html
index 0ac3d566d..8de2d21d0 100644
--- a/packages/tauri/index.html
+++ b/packages/tauri/index.html
@@ -14,7 +14,7 @@
-
+
-
+
diff --git a/packages/tauri/package.json b/packages/tauri/package.json
index 7e0f670b4..768791ddc 100644
--- a/packages/tauri/package.json
+++ b/packages/tauri/package.json
@@ -1,7 +1,7 @@
{
"name": "@opencode-ai/tauri",
"private": true,
- "version": "1.0.150",
+ "version": "1.0.152",
"type": "module",
"scripts": {
"typecheck": "tsgo -b",
@@ -16,6 +16,7 @@
"@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",
diff --git a/packages/tauri/src-tauri/Cargo.lock b/packages/tauri/src-tauri/Cargo.lock
index b42329d75..42a7dae81 100644
--- a/packages/tauri/src-tauri/Cargo.lock
+++ b/packages/tauri/src-tauri/Cargo.lock
@@ -1256,6 +1256,16 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix",
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -2309,6 +2319,16 @@ dependencies = [
"objc2-foundation 0.3.2",
]
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.3",
+ "objc2-foundation 0.3.2",
+]
+
[[package]]
name = "objc2-core-text"
version = "0.3.2"
@@ -2440,6 +2460,7 @@ checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
"bitflags 2.10.0",
"objc2 0.6.3",
+ "objc2-core-foundation",
"objc2-foundation 0.3.2",
]
@@ -2461,8 +2482,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
dependencies = [
"bitflags 2.10.0",
+ "block2 0.6.2",
"objc2 0.6.3",
+ "objc2-cloud-kit",
+ "objc2-core-data",
"objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2 0.6.3",
"objc2-foundation 0.3.2",
]
@@ -2511,6 +2551,7 @@ dependencies = [
"tauri-build",
"tauri-plugin-dialog",
"tauri-plugin-opener",
+ "tauri-plugin-os",
"tauri-plugin-process",
"tauri-plugin-shell",
"tauri-plugin-store",
@@ -2535,6 +2576,22 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "os_info"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
+dependencies = [
+ "android_system_properties",
+ "log",
+ "nix",
+ "objc2 0.6.3",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit",
+ "serde",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "os_pipe"
version = "1.2.3"
@@ -3872,6 +3929,15 @@ dependencies = [
"syn 2.0.110",
]
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "system-deps"
version = "6.2.2"
@@ -4146,6 +4212,24 @@ dependencies = [
"zbus",
]
+[[package]]
+name = "tauri-plugin-os"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997"
+dependencies = [
+ "gethostname",
+ "log",
+ "os_info",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript",
+ "sys-locale",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.17",
+]
+
[[package]]
name = "tauri-plugin-process"
version = "2.3.1"
diff --git a/packages/tauri/src-tauri/Cargo.toml b/packages/tauri/src-tauri/Cargo.toml
index f72e5f428..a39c22011 100644
--- a/packages/tauri/src-tauri/Cargo.toml
+++ b/packages/tauri/src-tauri/Cargo.toml
@@ -31,3 +31,4 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = "1.48.0"
listeners = "0.3"
+tauri-plugin-os = "2"
diff --git a/packages/tauri/src-tauri/capabilities/default.json b/packages/tauri/src-tauri/capabilities/default.json
index 320586de4..91af8cbdc 100644
--- a/packages/tauri/src-tauri/capabilities/default.json
+++ b/packages/tauri/src-tauri/capabilities/default.json
@@ -13,6 +13,7 @@
"dialog:default",
"process:default",
"store:default",
- "window-state:default"
+ "window-state:default",
+ "os:default"
]
}
diff --git a/packages/tauri/src-tauri/src/lib.rs b/packages/tauri/src-tauri/src/lib.rs
index eb712235e..a275fab78 100644
--- a/packages/tauri/src-tauri/src/lib.rs
+++ b/packages/tauri/src-tauri/src/lib.rs
@@ -5,6 +5,8 @@ use std::{
time::{Duration, Instant},
};
use tauri::{AppHandle, LogicalSize, Manager, Monitor, RunEvent, WebviewUrl, WebviewWindow};
+#[cfg(target_os = "macos")]
+use tauri::TitleBarStyle;
use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogResult};
use tauri_plugin_shell::process::{CommandChild, CommandEvent};
use tauri_plugin_shell::ShellExt;
@@ -107,6 +109,7 @@ pub fn run() {
let updater_enabled = option_env!("TAURI_SIGNING_PRIVATE_KEY").is_some();
let mut builder = tauri::Builder::default()
+ .plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_window_state::Builder::new().build())
.plugin(tauri_plugin_store::Builder::new().build())
.plugin(tauri_plugin_dialog::init())
@@ -190,7 +193,9 @@ pub fn run() {
#[cfg(target_os = "macos")]
{
- window_builder = window_builder.hidden_title(true);
+ window_builder = window_builder
+ .title_bar_style(TitleBarStyle::Overlay)
+ .hidden_title(true);
}
window_builder.build().expect("Failed to create window");
diff --git a/packages/tauri/src/index.tsx b/packages/tauri/src/index.tsx
index c72805fe6..84ba73c07 100644
--- a/packages/tauri/src/index.tsx
+++ b/packages/tauri/src/index.tsx
@@ -5,6 +5,7 @@ import { runUpdater } from "./updater"
import { onMount } from "solid-js"
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"
const root = document.getElementById("root")
if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -54,6 +55,9 @@ render(() => {
return (
+ {ostype() === "macos" && (
+
+ )}
)
diff --git a/packages/ui/package.json b/packages/ui/package.json
index e7bcbbf79..d3d230c49 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/ui",
- "version": "1.0.150",
+ "version": "1.0.152",
"type": "module",
"exports": {
"./*": "./src/components/*.tsx",
@@ -12,7 +12,8 @@
"./styles/tailwind": "./src/styles/tailwind/index.css",
"./icons/provider": "./src/components/provider-icons/types.ts",
"./icons/file-type": "./src/components/file-icons/types.ts",
- "./fonts/*": "./src/assets/fonts/*"
+ "./fonts/*": "./src/assets/fonts/*",
+ "./audio/*": "./src/assets/audio/*"
},
"scripts": {
"typecheck": "tsgo --noEmit",
@@ -21,6 +22,7 @@
},
"devDependencies": {
"@types/bun": "catalog:",
+ "@types/luxon": "catalog:",
"@tsconfig/node22": "catalog:",
"typescript": "catalog:",
"vite": "catalog:",
@@ -35,6 +37,8 @@
"@opencode-ai/util": "workspace:*",
"@pierre/precision-diffs": "catalog:",
"@shikijs/transformers": "3.9.2",
+ "@solid-primitives/bounds": "0.1.3",
+ "@solid-primitives/resize-observer": "2.1.3",
"@solidjs/meta": "catalog:",
"@typescript/native-preview": "catalog:",
"fuzzysort": "catalog:",
diff --git a/packages/ui/src/assets/audio/staplebops-01.aac b/packages/ui/src/assets/audio/staplebops-01.aac
new file mode 100644
index 000000000..01ae83db7
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-01.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-02.aac b/packages/ui/src/assets/audio/staplebops-02.aac
new file mode 100644
index 000000000..698137c26
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-02.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-03.aac b/packages/ui/src/assets/audio/staplebops-03.aac
new file mode 100644
index 000000000..5efa4451e
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-03.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-04.aac b/packages/ui/src/assets/audio/staplebops-04.aac
new file mode 100644
index 000000000..02d6bd5d7
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-04.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-05.aac b/packages/ui/src/assets/audio/staplebops-05.aac
new file mode 100644
index 000000000..7f0de4aa5
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-05.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-06.aac b/packages/ui/src/assets/audio/staplebops-06.aac
new file mode 100644
index 000000000..0c010dfb0
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-06.aac differ
diff --git a/packages/ui/src/assets/audio/staplebops-07.aac b/packages/ui/src/assets/audio/staplebops-07.aac
new file mode 100644
index 000000000..7d20ce755
Binary files /dev/null and b/packages/ui/src/assets/audio/staplebops-07.aac differ
diff --git a/packages/ui/src/components/basic-tool.tsx b/packages/ui/src/components/basic-tool.tsx
index 596eef00b..4fab331a5 100644
--- a/packages/ui/src/components/basic-tool.tsx
+++ b/packages/ui/src/components/basic-tool.tsx
@@ -21,12 +21,13 @@ export interface BasicToolProps {
trigger: TriggerTitle | JSX.Element
children?: JSX.Element
hideDetails?: boolean
+ defaultOpen?: boolean
}
export function BasicTool(props: BasicToolProps) {
const resolved = children(() => props.children)
return (
-
+
diff --git a/packages/ui/src/components/button.css b/packages/ui/src/components/button.css
index 3a32672fe..c5bd2c696 100644
--- a/packages/ui/src/components/button.css
+++ b/packages/ui/src/components/button.css
@@ -100,6 +100,26 @@
}
}
+ &[data-size="small"] {
+ height: 22px;
+ padding: 0 8px;
+ &[data-icon] {
+ padding: 0 12px 0 4px;
+ }
+
+ font-size: var(--font-size-small);
+ line-height: var(--line-height-large);
+ gap: 4px;
+
+ /* text-12-medium */
+ font-family: var(--font-family-sans);
+ font-size: var(--font-size-small);
+ font-style: normal;
+ font-weight: var(--font-weight-medium);
+ line-height: var(--line-height-large); /* 166.667% */
+ letter-spacing: var(--letter-spacing-normal);
+ }
+
&[data-size="normal"] {
height: 24px;
padding: 0 6px;
diff --git a/packages/ui/src/components/button.tsx b/packages/ui/src/components/button.tsx
index 0802c3629..7f974b2f7 100644
--- a/packages/ui/src/components/button.tsx
+++ b/packages/ui/src/components/button.tsx
@@ -5,7 +5,7 @@ import { Icon, IconProps } from "./icon"
export interface ButtonProps
extends ComponentProps
,
Pick, "class" | "classList" | "children"> {
- size?: "normal" | "large"
+ size?: "small" | "normal" | "large"
variant?: "primary" | "secondary" | "ghost"
icon?: IconProps["name"]
}
diff --git a/packages/ui/src/components/icon.tsx b/packages/ui/src/components/icon.tsx
index ce4bf7556..0dbd7a650 100644
--- a/packages/ui/src/components/icon.tsx
+++ b/packages/ui/src/components/icon.tsx
@@ -4,6 +4,7 @@ const icons = {
"align-right": ``,
"arrow-up": ``,
"arrow-left": ``,
+ archive: ``,
"bubble-5": ``,
"bullet-list": ``,
"check-small": ``,
@@ -23,6 +24,7 @@ const icons = {
folder: ``,
"magnifying-glass": ``,
"plus-small": ``,
+ plus: ``,
"pencil-line": ``,
mcp: ``,
glasses: ``,
@@ -39,7 +41,7 @@ const icons = {
"square-arrow-top-right": ``,
"speech-bubble": ``,
"folder-add-left": ``,
- "settings-gear": ``,
+ "settings-gear": ` `,
github: ``,
discord: ``,
"layout-bottom": ``,
diff --git a/packages/ui/src/components/message-part.css b/packages/ui/src/components/message-part.css
index 1ccee7320..9d4214bae 100644
--- a/packages/ui/src/components/message-part.css
+++ b/packages/ui/src/components/message-part.css
@@ -29,6 +29,16 @@
}
}
+[data-component="reasoning-part"] {
+ width: 100%;
+ opacity: 0.5;
+
+ [data-component="markdown"] {
+ margin-top: 24px;
+ font-style: italic !important;
+ }
+}
+
[data-component="tool-error"] {
display: flex;
align-items: start;
@@ -74,6 +84,22 @@
margin: 0;
padding: 0;
}
+
+ &[data-scrollable] {
+ height: auto;
+ max-height: 240px;
+ overflow-y: auto;
+ scrollbar-width: none;
+ -ms-overflow-style: none;
+
+ &::-webkit-scrollbar {
+ display: none;
+ }
+
+ [data-component="markdown"] {
+ overflow: visible;
+ }
+ }
}
[data-component="edit-trigger"],
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index a28e36aa8..a596b811e 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -8,6 +8,7 @@ import {
ToolPart,
UserMessage,
} from "@opencode-ai/sdk/v2"
+import { useData } from "../context"
import { useDiffComponent } from "../context/diff"
import { BasicTool } from "./basic-tool"
import { GenericTool } from "./basic-tool"
@@ -16,27 +17,34 @@ import { Icon } from "./icon"
import { Checkbox } from "./checkbox"
import { DiffChanges } from "./diff-changes"
import { Markdown } from "./markdown"
-import { getDirectory, getFilename } from "@opencode-ai/util/path"
-import { sanitizePart } from "@opencode-ai/util/sanitize"
-import { unwrap } from "solid-js/store"
+import { getDirectory as _getDirectory, getFilename } from "@opencode-ai/util/path"
export interface MessageProps {
message: MessageType
parts: PartType[]
- sanitize?: RegExp
}
export interface MessagePartProps {
part: PartType
message: MessageType
hideDetails?: boolean
- sanitize?: RegExp
}
export type PartComponent = Component
export const PART_MAPPING: Record = {}
+function relativizeProjectPaths(text: string, directory?: string) {
+ if (!text) return ""
+ if (!directory) return text
+ return text.split(directory).join("")
+}
+
+function getDirectory(path: string | undefined) {
+ const data = useData()
+ return relativizeProjectPaths(_getDirectory(path), data.directory)
+}
+
export function registerPartComponent(type: string, component: PartComponent) {
PART_MAPPING[type] = component
}
@@ -49,27 +57,20 @@ export function Message(props: MessageProps) {
{(assistantMessage) => (
-
+
)}
)
}
-export function AssistantMessageDisplay(props: { message: AssistantMessage; parts: PartType[]; sanitize?: RegExp }) {
+export function AssistantMessageDisplay(props: { message: AssistantMessage; parts: PartType[] }) {
const filteredParts = createMemo(() => {
return props.parts?.filter((x) => {
- if (x.type === "reasoning") return false
return x.type !== "tool" || (x as ToolPart).tool !== "todoread"
})
})
- return (
- {(part) => }
- )
+ return {(part) => }
}
export function UserMessageDisplay(props: { message: UserMessage; parts: PartType[] }) {
@@ -84,10 +85,9 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTyp
export function Part(props: MessagePartProps) {
const component = createMemo(() => PART_MAPPING[props.part.type])
- const part = createMemo(() => sanitizePart(unwrap(props.part), props.sanitize))
return (
-
+
)
}
@@ -175,12 +175,15 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
}
PART_MAPPING["text"] = function TextPartDisplay(props) {
+ const data = useData()
const part = props.part as TextPart
- const sanitized = createMemo(() => (props.sanitize ? (sanitizePart(unwrap(part), props.sanitize) as TextPart) : part))
+ const content = createMemo(() => (part.text ?? "").trim())
+ const displayText = createMemo(() => relativizeProjectPaths(content(), data.directory))
+
return (
-
+
-
+
)
@@ -318,13 +321,14 @@ ToolRegistry.register({
render(props) {
return (
-
+
@@ -340,6 +344,7 @@ ToolRegistry.register({
const diffComponent = useDiffComponent()
return (
diff --git a/packages/ui/src/components/message-progress.css b/packages/ui/src/components/message-progress.css
deleted file mode 100644
index 0b84e0393..000000000
--- a/packages/ui/src/components/message-progress.css
+++ /dev/null
@@ -1,50 +0,0 @@
-[data-component="message-progress"] {
- display: flex;
- flex-direction: column;
- gap: 12px;
-}
-
-[data-component="message-progress"] [data-slot="message-progress-status"] {
- display: flex;
- align-items: center;
- column-gap: 20px;
- padding-left: 12px;
- border: 1px solid transparent;
- color: var(--text-base);
-}
-
-[data-component="message-progress"] [data-slot="message-progress-status-text"] {
- font-size: 12px;
- font-weight: 500;
- line-height: 1.5;
-}
-
-[data-component="message-progress"] [data-slot="message-progress-list-container"] {
- height: 120px;
- overflow: hidden;
- pointer-events: none;
- padding-bottom: 4px;
-
- mask-image: linear-gradient(to bottom, transparent 0%, black 33%, black 95%, transparent 100%);
- -webkit-mask-image: linear-gradient(to bottom, transparent 0%, black 33%, black 95%, transparent 100%);
-}
-
-[data-component="message-progress"] [data-slot="message-progress-list"] {
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- align-self: stretch;
- gap: 8px;
- padding-top: 32px;
- padding-bottom: 32px;
-
- transition: transform 500ms cubic-bezier(0.22, 1, 0.36, 1);
-}
-
-[data-component="message-progress"] [data-slot="message-progress-item"] {
- height: 32px;
- display: flex;
- align-items: center;
- width: 100%;
-}
diff --git a/packages/ui/src/components/message-progress.tsx b/packages/ui/src/components/message-progress.tsx
deleted file mode 100644
index ef3548ab3..000000000
--- a/packages/ui/src/components/message-progress.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { For, JSXElement, Match, Show, Switch, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
-import { Part } from "./message-part"
-import { Spinner } from "./spinner"
-import { useData } from "../context/data"
-import type { AssistantMessage as AssistantMessageType, ToolPart } from "@opencode-ai/sdk/v2"
-
-export interface MessageProgressProps {
- assistantMessages: () => AssistantMessageType[]
- done?: boolean
-}
-
-export function MessageProgress(props: MessageProgressProps) {
- const data = useData()
- const sanitizer = createMemo(() => (data.directory ? new RegExp(`${data.directory}/`, "g") : undefined))
- const parts = createMemo(() => props.assistantMessages().flatMap((m) => data.store.part[m.id]))
- const done = createMemo(() => props.done ?? false)
- const currentTask = createMemo(
- () =>
- parts().findLast(
- (p) =>
- p &&
- p.type === "tool" &&
- p.tool === "task" &&
- p.state &&
- "metadata" in p.state &&
- p.state.metadata &&
- p.state.metadata.sessionId &&
- p.state.status === "running",
- ) as ToolPart,
- )
- const resolvedParts = createMemo(() => {
- let resolved = parts()
- const task = currentTask()
- if (task && task.state && "metadata" in task.state && task.state.metadata?.sessionId) {
- const messages = data.store.message[task.state.metadata.sessionId as string]?.filter(
- (m) => m.role === "assistant",
- )
- resolved = messages?.flatMap((m) => data.store.part[m.id]) ?? parts()
- }
- return resolved
- })
-
- const eligibleItems = createMemo(() => {
- return resolvedParts().filter((p) => p?.type === "tool" && p?.state.status === "completed") as ToolPart[]
- })
- const finishedItems = createMemo<(JSXElement | ToolPart)[]>(() => [
- ,
- ,
- ,
- ...eligibleItems(),
- ...(done()
- ? [
- ,
- ,
- ,
- ]
- : []),
- ])
-
- const delay = createMemo(() => (done() ? 220 : 400))
- const [visibleCount, setVisibleCount] = createSignal(eligibleItems().length)
-
- createEffect(() => {
- const total = finishedItems().length
- if (total > visibleCount()) {
- const timer = setTimeout(() => {
- setVisibleCount((prev) => prev + 1)
- }, delay())
- onCleanup(() => clearTimeout(timer))
- } else if (total < visibleCount()) {
- setVisibleCount(total)
- }
- })
-
- const translateY = createMemo(() => {
- const total = visibleCount()
- if (total < 2) return "0px"
- return `-${(total - 2) * 40 - 8}px`
- })
-
- const lastPart = createMemo(() => resolvedParts().slice(-1)?.at(0))
- const rawStatus = createMemo(() => {
- const last = lastPart()
- if (!last) return undefined
-
- if (last.type === "tool") {
- switch (last.tool) {
- case "task":
- return "Delegating work..."
- case "todowrite":
- case "todoread":
- return "Planning next steps..."
- case "read":
- return "Gathering context..."
- case "list":
- case "grep":
- case "glob":
- return "Searching the codebase..."
- case "webfetch":
- return "Searching the web..."
- case "edit":
- case "write":
- return "Making edits..."
- case "bash":
- return "Running commands..."
- default:
- break
- }
- } else if (last.type === "reasoning") {
- return "Thinking..."
- } else if (last.type === "text") {
- return "Gathering thoughts..."
- }
- return undefined
- })
-
- const [status, setStatus] = createSignal(rawStatus())
- let lastStatusChange = Date.now()
- let statusTimeout: number | undefined
-
- createEffect(() => {
- const newStatus = rawStatus()
- if (newStatus === status() || !newStatus) return
-
- const timeSinceLastChange = Date.now() - lastStatusChange
-
- if (timeSinceLastChange >= 1500) {
- setStatus(newStatus)
- lastStatusChange = Date.now()
- if (statusTimeout) {
- clearTimeout(statusTimeout)
- statusTimeout = undefined
- }
- } else {
- if (statusTimeout) clearTimeout(statusTimeout)
- statusTimeout = setTimeout(() => {
- setStatus(rawStatus())
- lastStatusChange = Date.now()
- statusTimeout = undefined
- }, 1000 - timeSinceLastChange) as unknown as number
- }
- })
-
- return (
-
-
- {status() ?? "Considering next steps..."}
-
-
0}>
-
-
-
- {(part) => (
-
-
- {(p) => {
- const part = p() as ToolPart
- const message = createMemo(() =>
- data.store.message[part.sessionID].find((m) => m.id === part.messageID),
- )
- return (
-
- )
- }}
-
-
- {part as JSXElement}
-
-
- )}
-
-
-
-
-
-
- {(msg) => {
- const [detailsExpanded, setDetailsExpanded] = createSignal(false)
-
- // Animation logic: only animate if we witness the value transition from empty to non-empty
- // Track in module-level Maps keyed by message ID so it persists across re-renders
-
- // Initialize animation state for current message (reactive - runs when msg().id changes)
- createEffect(() => {
- const id = msg().id
- if (!titleAnimationState.has(id)) {
- titleAnimationState.set(id, msg().summary?.title ? "done" : "empty")
- }
- if (!summaryAnimationState.has(id)) {
- const assistantMsgs = messages()?.filter(
- (m) => m.role === "assistant" && m.parentID == id,
+
+
+
+ {(message) => {
+ const assistantMessages = createMemo(() => {
+ return messages()?.filter(
+ (m) => m.role === "assistant" && m.parentID == message().id,
) as AssistantMessage[]
- const parts = assistantMsgs?.flatMap((m) => data.store.part[m.id])
- const lastText = parts?.filter((p) => p?.type === "text")?.at(-1)
- const summaryValue = msg().summary?.body ?? lastText?.text
- summaryAnimationState.set(id, summaryValue ? "done" : "empty")
+ })
+ const lastAssistantMessage = createMemo(() => assistantMessages()?.at(-1))
+ const assistantMessageParts = createMemo(() => assistantMessages()?.flatMap((m) => data.store.part[m.id]))
+ const error = createMemo(() => assistantMessages().find((m) => m?.error)?.error)
+ const parts = createMemo(() => data.store.part[message().id])
+ const lastTextPart = createMemo(() =>
+ assistantMessageParts()
+ .filter((p) => p?.type === "text")
+ ?.at(-1),
+ )
+ const summary = createMemo(() => message().summary?.body ?? lastTextPart()?.text)
+ const lastTextPartShown = createMemo(
+ () => !message().summary?.body && (lastTextPart()?.text?.length ?? 0) > 0,
+ )
+
+ const assistantParts = createMemo(() => assistantMessages().flatMap((m) => data.store.part[m.id]))
+ const currentTask = createMemo(
+ () =>
+ assistantParts().findLast(
+ (p) =>
+ p &&
+ p.type === "tool" &&
+ p.tool === "task" &&
+ p.state &&
+ "metadata" in p.state &&
+ p.state.metadata &&
+ p.state.metadata.sessionId &&
+ p.state.status === "running",
+ ) as ToolPart,
+ )
+ const resolvedParts = createMemo(() => {
+ let resolved = assistantParts()
+ const task = currentTask()
+ if (task && task.state && "metadata" in task.state && task.state.metadata?.sessionId) {
+ const messages = data.store.message[task.state.metadata.sessionId as string]?.filter(
+ (m) => m.role === "assistant",
+ )
+ resolved = messages?.flatMap((m) => data.store.part[m.id]) ?? assistantParts()
+ }
+ return resolved
+ })
+ const lastPart = createMemo(() => resolvedParts().slice(-1)?.at(0))
+ const rawStatus = createMemo(() => {
+ const last = lastPart()
+ if (!last) return undefined
+
+ if (last.type === "tool") {
+ switch (last.tool) {
+ case "task":
+ return "Delegating work"
+ case "todowrite":
+ case "todoread":
+ return "Planning next steps"
+ case "read":
+ return "Gathering context"
+ case "list":
+ case "grep":
+ case "glob":
+ return "Searching the codebase"
+ case "webfetch":
+ return "Searching the web"
+ case "edit":
+ case "write":
+ return "Making edits"
+ case "bash":
+ return "Running commands"
+ default:
+ break
+ }
+ } else if (last.type === "reasoning") {
+ return "Thinking"
+ } else if (last.type === "text") {
+ return "Gathering thoughts"
+ }
+ return undefined
+ })
+
+ function duration() {
+ const completed = lastAssistantMessage()?.time.completed
+ const from = DateTime.fromMillis(message()!.time.created)
+ const to = completed ? DateTime.fromMillis(completed) : DateTime.now()
+ const interval = Interval.fromDateTimes(from, to)
+ const unit: DurationUnit[] = interval.length("seconds") > 60 ? ["minutes", "seconds"] : ["seconds"]
+
+ return interval.toDuration(unit).normalize().toHuman({
+ notation: "compact",
+ unitDisplay: "narrow",
+ compactDisplay: "short",
+ showZeros: false,
+ })
}
- // When message changes or component unmounts, mark any "animating" states as "done"
- onCleanup(() => {
- if (titleAnimationState.get(id) === "animating") {
- titleAnimationState.set(id, "done")
- }
- if (summaryAnimationState.get(id) === "animating") {
- summaryAnimationState.set(id, "done")
+ const [store, setStore] = createStore({
+ status: rawStatus(),
+ stepsExpanded: true,
+ duration: duration(),
+ })
+
+ createEffect(() => {
+ const timer = setInterval(() => {
+ setStore("duration", duration())
+ }, 1000)
+ onCleanup(() => clearInterval(timer))
+ })
+
+ let lastStatusChange = Date.now()
+ let statusTimeout: number | undefined
+ createEffect(() => {
+ const newStatus = rawStatus()
+ if (newStatus === store.status || !newStatus) return
+
+ const timeSinceLastChange = Date.now() - lastStatusChange
+
+ if (timeSinceLastChange >= 2500) {
+ setStore("status", newStatus)
+ lastStatusChange = Date.now()
+ if (statusTimeout) {
+ clearTimeout(statusTimeout)
+ statusTimeout = undefined
+ }
+ } else {
+ if (statusTimeout) clearTimeout(statusTimeout)
+ statusTimeout = setTimeout(() => {
+ setStore("status", rawStatus())
+ lastStatusChange = Date.now()
+ statusTimeout = undefined
+ }, 2500 - timeSinceLastChange) as unknown as number
}
})
- })
- const assistantMessages = createMemo(() => {
- return messages()?.filter((m) => m.role === "assistant" && m.parentID == msg().id) as AssistantMessage[]
- })
- const assistantMessageParts = createMemo(() => assistantMessages()?.flatMap((m) => data.store.part[m.id]))
- const error = createMemo(() => assistantMessages().find((m) => m?.error)?.error)
- const parts = createMemo(() => data.store.part[msg().id])
- const lastTextPart = createMemo(() =>
- assistantMessageParts()
- .filter((p) => p?.type === "text")
- ?.at(-1),
- )
- const hasToolPart = createMemo(() => assistantMessageParts().some((p) => p?.type === "tool"))
- const messageWorking = createMemo(() => msg().id === lastUserMessage()?.id && working())
- const initialCompleted = !(msg().id === lastUserMessage()?.id && working())
- const [completed, setCompleted] = createSignal(initialCompleted)
- const summary = createMemo(() => msg().summary?.body ?? lastTextPart()?.text)
- const lastTextPartShown = createMemo(() => !msg().summary?.body && (lastTextPart()?.text?.length ?? 0) > 0)
+ createEffect((prev) => {
+ const isWorking = working()
+ if (prev && !isWorking && !userScrolled()) {
+ setStore("stepsExpanded", false)
+ }
+ return isWorking
+ }, working())
- // Should animate: state is "empty" AND value now exists, or state is "animating"
- // Transition: empty -> animating -> done (done happens on cleanup)
- const animateTitle = createMemo(() => {
- const id = msg().id
- const state = titleAnimationState.get(id)
- const title = msg().summary?.title
- if (state === "animating") {
- return true
- }
- if (state === "empty" && title) {
- titleAnimationState.set(id, "animating")
- return true
- }
- return false
- })
- const animateSummary = createMemo(() => {
- const id = msg().id
- const state = summaryAnimationState.get(id)
- const value = summary()
- if (state === "animating") {
- return true
- }
- if (state === "empty" && value) {
- summaryAnimationState.set(id, "animating")
- return true
- }
- return false
- })
-
- createEffect(() => {
- const done = !messageWorking()
- setTimeout(() => setCompleted(done), 1200)
- })
-
- return (
-
- {/* Title */}
-
-
- }
- >
-
{msg().summary?.title}
-
-
-
-
-
-
- {/* Summary */}
-
-
-
-
+ return (
+
+ {/* Sticky Header */}
+
+
+
- Summary
- Response
+
+
+
+
+ {message().summary?.title}
+
-
-
- {(summary) => (
-
- )}
+
+
+
+
+
+
+
+
+
+ {/* Response */}
+
+
+
+ {(assistantMessage) => {
+ const parts = createMemo(() => data.store.part[assistantMessage.id] ?? [])
+ const last = createMemo(() =>
+ parts()
+ .filter((p) => p?.type === "text")
+ .at(-1),
+ )
+ return (
+
+
+ p?.id !== last()?.id)}
+ />
+
+
+
+
+
+ )
+ }}
+
+
+
+ {error()?.data?.message as string}
+
-
-
- {(diff) => (
-
-
-
-
-
-
-
-
- {getDirectory(diff.file)}
-
-
{getFilename(diff.file)}
+
+ {/* Summary */}
+
+
+
+
+
+ Summary
+ Response
+
+
+
+ {(summary) => (
+
+ )}
+
+
+
+
+ {(diff) => (
+
+
+
+
+
+
+
+
+ {getDirectory(diff.file)}
+
+ {getFilename(diff.file)}
+
+
+
+
+
-
-
-
-
-
-
-
- {error()?.data?.message as string}
-
-
- {/* Response */}
-
-
-
-
-
-
-
-
-
-
-
- Hide details
- Show details
-
-
-
-
-
- {(assistantMessage) => {
- const parts = createMemo(() => data.store.part[assistantMessage.id])
- const last = createMemo(() =>
- parts()
- .filter((p) => p?.type === "text")
- .at(-1),
- )
- if (lastTextPartShown() && lastTextPart()?.id === last()?.id) {
- return (
- p?.id !== last()?.id)}
- sanitize={sanitizer()}
- />
- )
- }
- return
- }}
-
-
-
- {error()?.data?.message as string}
-
-
-
-
-
-
-
+
+
+
+
+
+
+ )}
+
+
+
+
+
+
+ {error()?.data?.message as string}
+
+
-
- {props.children}
+ )
+ }}
+
+ {props.children}
+