-
-
- {/* The empty inset above the panels moves the window, as the titlebar does. */}
-
-
-
-
-
diff --git a/packages/app/src/workspaces/selection/domain.test.ts b/packages/app/src/workspaces/selection/domain.test.ts
index 12ce4838559..3b61918395f 100644
--- a/packages/app/src/workspaces/selection/domain.test.ts
+++ b/packages/app/src/workspaces/selection/domain.test.ts
@@ -3,7 +3,6 @@ import {
absoluteTreePath,
activeTreeNavigation,
nextSuggestionIndex,
- nextTreeScrollTop,
pickerFileSearchQuery,
pickerMode,
selectedTreePath,
@@ -113,12 +112,32 @@ test.each([
["relative input", pickerAbsoluteInput("src", "C:/Users/luke", "C:/Users/luke/repo"), "C:/Users/luke/repo/src"],
["file search", pickerFileSearchQuery("/home/luke/repos", "/home/luke/repos/src/in", "/home/luke"), "src/in"],
["file search", pickerFileSearchQuery("/home/luke", "~/repos/op", "/home/luke"), "repos/op"],
- ["recent short 2-level tilde", shortenPickerRecentPath("/home/luke/Developer/opencode", "/home/luke"), "~/Developer/opencode"],
- ["recent deep tilde", shortenPickerRecentPath("/home/luke/workspaces/anomalyco/opencode/packages/app", "/home/luke"), "~/…/packages/app"],
- ["recent short 2-level root", shortenPickerRecentPath("/workspace/billing-api", "/home/luke"), "/workspace/billing-api"],
- ["recent deep root", shortenPickerRecentPath("/srv/clients/acme/services/payments-gateway", "/home/luke"), "/srv/…/services/payments-gateway"],
+ [
+ "recent short 2-level tilde",
+ shortenPickerRecentPath("/home/luke/Developer/opencode", "/home/luke"),
+ "~/Developer/opencode",
+ ],
+ [
+ "recent deep tilde",
+ shortenPickerRecentPath("/home/luke/workspaces/anomalyco/opencode/packages/app", "/home/luke"),
+ "~/…/packages/app",
+ ],
+ [
+ "recent short 2-level root",
+ shortenPickerRecentPath("/workspace/billing-api", "/home/luke"),
+ "/workspace/billing-api",
+ ],
+ [
+ "recent deep root",
+ shortenPickerRecentPath("/srv/clients/acme/services/payments-gateway", "/home/luke"),
+ "/srv/…/services/payments-gateway",
+ ],
["recent short Windows", shortenPickerRecentPath("C:/OpenCode/NewProject", ""), "C:\\OpenCode\\NewProject"],
- ["recent deep Windows", shortenPickerRecentPath("C:/Users/luke/work/acme/repo", "C:/Users/luke"), "C:\\…\\acme\\repo"],
+ [
+ "recent deep Windows",
+ shortenPickerRecentPath("C:/Users/luke/work/acme/repo", "C:/Users/luke"),
+ "C:\\…\\acme\\repo",
+ ],
])("uses the selected server path format for %s: %p", (_name, actual, expected) => {
expect(actual).toBe(expected)
})
@@ -440,14 +459,6 @@ test.each([
expect(activeTreeNavigation(request, current)).toBe(expected)
})
-test.each([
- [100, 40, 140],
- [10, -40, 0],
- [290, 40, 300],
-])("bridged wheel scrolling from %p by %p clamps to %p", (current, delta, expected) => {
- expect(nextTreeScrollTop(current, delta, 500, 200)).toBe(expected)
-})
-
test("wraps autocomplete keyboard navigation", () => {
expect(nextSuggestionIndex(-1, 1, 4)).toBe(0)
expect(nextSuggestionIndex(3, 1, 4)).toBe(0)
diff --git a/packages/app/src/workspaces/selection/domain.ts b/packages/app/src/workspaces/selection/domain.ts
index c25a6566be2..aa65f23ea61 100644
--- a/packages/app/src/workspaces/selection/domain.ts
+++ b/packages/app/src/workspaces/selection/domain.ts
@@ -219,10 +219,6 @@ export function createPriorityTaskQueue
(concurrency: number) {
return { schedule, promote }
}
-export function nextTreeScrollTop(current: number, delta: number, scrollHeight: number, clientHeight: number) {
- return Math.min(Math.max(0, scrollHeight - clientHeight), Math.max(0, current + delta))
-}
-
export function nextSuggestionIndex(current: number, delta: -1 | 1, count: number) {
if (count === 0) return -1
@@ -257,7 +253,7 @@ export function selectedTreePath(root: string, path: string, mode: "directory" |
return directory ? nativePickerPath(absoluteTreePath(root, path)) : undefined
}
-export function nativePickerPath(path: string) {
+function nativePickerPath(path: string) {
const value = trimPickerPath(path)
if (/^[A-Za-z]:\//.test(value) || value.startsWith("//")) return value.replaceAll("/", "\\")
@@ -275,7 +271,7 @@ export function cleanPickerInput(value: string) {
return first.replace(/[\u0000-\u001F\u007F]/g, "").trim()
}
-export function normalizePickerPath(input: string) {
+function normalizePickerPath(input: string) {
const value = input.replaceAll("\\", "/")
if (value.startsWith("//") && !value.startsWith("///")) return "//" + value.slice(2).replace(/\/+/g, "/")
@@ -283,7 +279,7 @@ export function normalizePickerPath(input: string) {
return value.replace(/\/+/g, "/")
}
-export function normalizePickerDrive(input: string) {
+function normalizePickerDrive(input: string) {
const value = normalizePickerPath(input)
if (/^[A-Za-z]:$/.test(value)) return value + "/"
@@ -291,7 +287,7 @@ export function normalizePickerDrive(input: string) {
return value
}
-export function trimPickerPath(input: string) {
+function trimPickerPath(input: string) {
const value = normalizePickerDrive(input)
if (value === "/" || value === "//" || /^[A-Za-z]:\/$/.test(value)) return value
@@ -299,7 +295,7 @@ export function trimPickerPath(input: string) {
return value.replace(/\/+$/, "")
}
-export function joinPickerPath(base: string | undefined, relative: string) {
+function joinPickerPath(base: string | undefined, relative: string) {
const root = trimPickerPath(base ?? "")
const path = trimPickerPath(relative).replace(/^\/+/, "")
diff --git a/packages/app/src/workspaces/submenu.tsx b/packages/app/src/workspaces/submenu.tsx
deleted file mode 100644
index 1f8b3eccc03..00000000000
--- a/packages/app/src/workspaces/submenu.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Icon } from "@opencode/ui/icon"
-import { Menu } from "@opencode/ui/menu"
-import { getFilename } from "@opencode/util/path"
-import { createMemo, For, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/runtime/i18n/language"
-
-export function WorkspaceSubmenu(props: {
- directories: string[]
- selected?: string
- disabled?: boolean
- onSelect: (directory: string) => void
- onViewAll?: () => void
-}) {
- const language = useLanguage()
- const [store, setStore] = createStore({ search: "", holdSearchFocus: false })
- let input: HTMLInputElement | undefined
- let list: HTMLDivElement | undefined
- const searchable = () => props.directories.length >= 10
-
- const directories = createMemo(() => {
- const query = store.search.trim().toLowerCase()
-
- return props.directories.filter((directory) => getFilename(directory).toLowerCase().includes(query))
- })
-
- const focusSearch = () => {
- if (!searchable()) return
- setStore("holdSearchFocus", true)
- input?.focus({ preventScroll: true })
- }
-
- return (
- {
- if (!open) setStore({ search: "", holdSearchFocus: false })
- }}
- >
- {
- if (["ArrowRight", "ArrowLeft", "Enter", " "].includes(event.key)) focusSearch()
- }}
- >
-
- {language.t("session.new.workspace.existingLabel")}
-
-
- {
- if (store.holdSearchFocus && event.target !== input) input?.focus({ preventScroll: true })
- }}
- oncapture:pointermove={() => setStore("holdSearchFocus", false)}
- >
-
-
-
- setStore("search", event.currentTarget.value)}
- onKeyDown={(event) => {
- if (event.key === "ArrowDown" || event.key === "ArrowUp") {
- event.preventDefault()
- event.stopPropagation()
- setStore("holdSearchFocus", false)
- const items = list?.querySelectorAll('[role="menuitem"]:not([data-disabled])')
- items?.[event.key === "ArrowDown" ? 0 : items.length - 1]?.focus()
-
- return
- }
-
- if (["Escape", "Enter"].includes(event.key)) return
- event.stopPropagation()
- }}
- />
-
-
-
-
-
- props.onViewAll?.()}>
- {language.t("common.viewAll")}
-
-
-
-
-
- )
-}
diff --git a/packages/desktop/src/main/native/logging.ts b/packages/desktop/src/main/native/logging.ts
index eac3a3b4716..415b22286d3 100644
--- a/packages/desktop/src/main/native/logging.ts
+++ b/packages/desktop/src/main/native/logging.ts
@@ -9,8 +9,6 @@ import { marks } from "../lifecycle/marks"
const MAX_LOG_AGE_DAYS = 7
-const TAIL_LINES = 1000
-
const EXPORT_WINDOW = 24 * 60 * 60 * 1000
const MAX_EXPORT_FILE_SIZE = 50 * 1024 * 1024
@@ -77,10 +75,9 @@ const nativeLogger = Logger.make((options) => {
}
const messages = Array.isArray(options.message) ? options.message : [options.message]
- log.scope(safeLogName(scope))[methods[options.logLevel]](
- ...messages,
- ...(Object.keys(context).length === 0 ? [] : [context]),
- )
+ log
+ .scope(safeLogName(scope))
+ [methods[options.logLevel]](...messages, ...(Object.keys(context).length === 0 ? [] : [context]))
} catch {
// Logging must not interrupt application work.
}
@@ -137,9 +134,9 @@ function startNetLog(path: Path.Path) {
const target = path.join(run, "network.netlog")
netLogPath = target
- return Effect.tryPromise(() => netLog.startLogging(target, { captureMode: "default", maxFileSize: NET_LOG_SIZE })).pipe(
- Effect.tap(() => scoped("network", Effect.logInfo("net log started", { path: target }))),
- )
+ return Effect.tryPromise(() =>
+ netLog.startLogging(target, { captureMode: "default", maxFileSize: NET_LOG_SIZE }),
+ ).pipe(Effect.tap(() => scoped("network", Effect.logInfo("net log started", { path: target }))))
}
function exportDebugLogsEffect(fs: FileSystem.FileSystem, path: Path.Path) {
@@ -175,9 +172,7 @@ function exportDebugLogsEffect(fs: FileSystem.FileSystem, path: Path.Path) {
Effect.ensuring(
restartNetLog
? startNetLog(path).pipe(
- Effect.catch((error) =>
- scoped("network", Effect.logWarning("failed to restart net log", { error })),
- ),
+ Effect.catch((error) => scoped("network", Effect.logWarning("failed to restart net log", { error }))),
)
: Effect.void,
),
@@ -185,18 +180,6 @@ function exportDebugLogsEffect(fs: FileSystem.FileSystem, path: Path.Path) {
})
}
-export const tail = Effect.fn("DesktopLogging.tail")(function* () {
- const fs = yield* FileSystem.FileSystem
-
- return yield* Effect.gen(function* () {
- const path = log.transports.file.getFile().path
- const contents = yield* fs.readFileString(path)
- const lines = contents.split("\n")
-
- return lines.slice(Math.max(0, lines.length - TAIL_LINES)).join("\n")
- }).pipe(Effect.orElseSucceed(() => ""))
-})
-
function initRunDirectory(fs: FileSystem.FileSystem, path: Path.Path) {
root = path.join(app.getPath("userData"), "logs")
run = path.join(root, stamp())
@@ -258,9 +241,7 @@ function manifest(path: Path.Path) {
function serverLogRoots(path: Path.Path) {
const xdgData = process.env.XDG_DATA_HOME || path.join(homedir(), ".local", "share")
- return [
- ...new Set([path.join(xdgData, "opencode", "log"), path.join(app.getPath("userData"), "opencode", "log")]),
- ]
+ return [...new Set([path.join(xdgData, "opencode", "log"), path.join(app.getPath("userData"), "opencode", "log")])]
}
type Entry = { name: string; path: string; offset: number } | { name: string; data: Uint8Array }
diff --git a/packages/stories/mocks/app/context/global-sync.ts b/packages/stories/mocks/app/context/global-sync.ts
deleted file mode 100644
index 4f7d219d43b..00000000000
--- a/packages/stories/mocks/app/context/global-sync.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-const provider = {
- all: [
- {
- id: "anthropic",
- models: {
- "claude-3-7-sonnet": {
- id: "claude-3-7-sonnet",
- name: "Claude 3.7 Sonnet",
- cost: { input: 1, output: 1 },
- },
- },
- },
- ],
- connected: ["anthropic"],
- default: { anthropic: "claude-3-7-sonnet" },
-}
-
-export function useQueryOptions() {
- return {
- agents: (directory: string) => ({
- queryKey: [directory, "agents"],
- queryFn: async () => [],
- }),
- providers: (directory: string | null) => ({
- queryKey: [directory, "providers"],
- queryFn: async () => provider,
- }),
- }
-}
diff --git a/packages/stories/playwright/capture-chip-orb-flag.ts b/packages/stories/playwright/capture-chip-orb-flag.ts
deleted file mode 100644
index 9e73b79e52f..00000000000
--- a/packages/stories/playwright/capture-chip-orb-flag.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import { chromium, expect } from "@playwright/test"
-import { mkdir, rm } from "node:fs/promises"
-import path from "node:path"
-import { build } from "vite"
-import solid from "vite-plugin-solid"
-import tailwind from "@tailwindcss/vite"
-import type {} from "../../app/src/session/composer/activity-chips.fixture"
-
-// Production components and the story server's service mocks, bundled without a dev server.
-const out = path.resolve("captures/chip-orb-flag")
-const verify = process.argv.includes("--verify-only")
-const root = path.resolve("packages/stories/node_modules/.cache/chip-orb-proof")
-const mocks = path.resolve("packages/stories/mocks")
-await mkdir(out, { recursive: true })
-await mkdir(root, { recursive: true })
-await Bun.write(
- path.join(root, "index.html"),
- ``,
-)
-await build({
- configFile: false,
- root,
- publicDir: path.resolve("packages/app/public"),
- plugins: [solid(), tailwind()],
- resolve: {
- dedupe: ["solid-js", "solid-js/web", "@solidjs/meta", "@tanstack/solid-query"],
- alias: [
- { find: "@solidjs/router", replacement: path.join(mocks, "solid-router.tsx") },
- ...Object.entries({
- "providers/models/selection": "context/local.ts",
- "workspaces/files/model": "context/file.ts",
- "shell/state/layout": "context/layout.ts",
- "workspaces/location": "context/location.ts",
- "composer/comments": "context/comments.ts",
- "shell/commands/command": "context/command.ts",
- "runtime/platform/platform": "context/platform.ts",
- "runtime/server/global-sync": "context/global-sync.ts",
- "runtime/server/sync": "context/server-sync.ts",
- "runtime/server/client": "context/server-sdk.ts",
- "runtime/server/current": "context/server-current.ts",
- "providers/catalog/providers": "hooks/use-providers.ts",
- "providers/models/unpaid": "components/dialog-select-model-unpaid.tsx",
- }).map(([find, file]) => ({ find: `@/${find}`, replacement: path.join(mocks, "app", file) })),
- { find: "@", replacement: path.resolve("packages/app/src") },
- ],
- },
- build: { outDir: "dist", minify: true },
- worker: { format: "es" },
-})
-const server = Bun.serve({
- hostname: "127.0.0.1",
- port: 0,
- fetch: (request) => {
- const pathname = new URL(request.url).pathname
- return new Response(Bun.file(path.join(root, "dist", pathname === "/" ? "index.html" : pathname)))
- },
-})
-const browser = await chromium.launch()
-const context = await browser.newContext({
- viewport: { width: 1200, height: 800 },
- deviceScaleFactor: 2,
- recordVideo: verify ? undefined : { dir: path.join(out, "video"), size: { width: 1200, height: 800 } },
-})
-const page = await context.newPage()
-const errors: string[] = []
-const orbRequests: string[] = []
-page.on("request", (request) => {
- if (request.url().includes("css-agent-orb")) orbRequests.push(request.url())
-})
-page.on("pageerror", (error) => {
- errors.push(error.message)
- console.error(error.message)
-})
-try {
- await page.goto(String(server.url))
- const chip = page.locator('[data-slot="session-activity-chip"]')
- await chip.waitFor({ timeout: 30_000 }).catch(async (error) => {
- console.error(await page.locator("body").innerHTML())
- throw error
- })
- await page.evaluate(() => document.fonts.ready.then(() => undefined))
- await page.getByText("Chip corners", { exact: true }).waitFor()
- const choose = (mode: string, corners: string) =>
- page.evaluate(({ mode, corners }) => window.chipExperiment(mode, corners), { mode, corners })
- const initial = await chip.evaluate((chip) => ({
- transition: getComputedStyle(chip).transitionProperty,
- duration: getComputedStyle(chip).transitionDuration,
- orbs: document.querySelectorAll('[data-component="css-agent-orb"]').length,
- animations: document
- .getAnimations()
- .filter((animation) => animation instanceof CSSAnimation && animation.animationName.startsWith("css-orb")).length,
- }))
- if (
- initial.transition !== "all" ||
- initial.duration !== "0.15s" ||
- initial.orbs ||
- initial.animations ||
- orbRequests.length
- )
- throw new Error(`Default changed: ${JSON.stringify({ initial, orbRequests })}`)
- const geometry = []
- for (const mode of ["today", "orb"]) {
- for (const corners of ["capsule", "composer"]) {
- await choose(mode, corners)
- if (mode === "orb") await chip.locator('[data-component="css-agent-orb"]').waitFor()
- await expect(chip).toHaveCSS(
- "border-top-left-radius",
- mode === "today" ? "12px" : corners === "capsule" ? "9999px" : "10px",
- )
- geometry.push({
- mode,
- corners,
- ...(await page.evaluate(() => {
- const chip = document.querySelector('[data-slot="session-activity-chip"]')!
- const composer = document.querySelector('[data-component="composer"]')!
- const rect = chip.getBoundingClientRect()
- return {
- height: rect.height,
- radius: getComputedStyle(chip).borderTopLeftRadius,
- composerRadius: getComputedStyle(composer).borderTopLeftRadius,
- composerY: composer.getBoundingClientRect().y,
- glyphOffset:
- chip.querySelector('[data-slot="activity-glyph"]')!.getBoundingClientRect().x +
- 8 -
- rect.x -
- rect.height / 2,
- orb: chip.dataset.orb,
- }
- })),
- })
- if (!verify) await page.screenshot({ path: path.join(out, `${mode}-${corners}.png`) })
- }
- }
- await page.reload()
- await chip.waitFor()
- if ((await chip.getAttribute("data-orb")) !== "true") throw new Error("Choice did not persist")
- await choose("today", "capsule")
- await page.waitForTimeout(250)
- if ((await chip.locator('[data-component="css-agent-orb"]').count()) !== 1)
- throw new Error("Opted-in orb was unmounted")
- const fade = await page.evaluate(async () => {
- const chip = document.querySelector('[data-slot="session-activity-chip"]')!
- const orb = chip.querySelector('[data-slot="activity-glyph-orb"]')!
- const today = chip.querySelector('[data-slot="activity-glyph-today"]')!
- window.chipExperiment("orb", "capsule")
- const frames: number[][] = []
- await new Promise((resolve) => {
- const frame = () => {
- frames.push([Number(getComputedStyle(today).opacity), Number(getComputedStyle(orb).opacity)])
- if (frames.length === 20) return resolve()
- requestAnimationFrame(frame)
- }
- requestAnimationFrame(frame)
- })
- return frames
- })
- if (!fade.some(([a, b]) => a > 0 && b > 0) || fade.some(([a, b]) => a + b < 0.99))
- throw new Error("Glyph swap popped or blanked")
- if (!verify) await page.waitForTimeout(5000)
- await page.evaluate(() => (document.documentElement.dataset.motion = "reduce"))
- const explicitReduced = await chip
- .locator('[data-component="css-agent-orb"]')
- .evaluate((orb) => orb.getAnimations({ subtree: true }).length)
- if (explicitReduced !== 0) throw new Error("Explicit reduced motion orb still animates")
- await page.evaluate(() => delete document.documentElement.dataset.motion)
- await page.emulateMedia({ reducedMotion: "reduce" })
- const reduced = await chip
- .locator('[data-component="css-agent-orb"]')
- .evaluate((orb) => orb.getAnimations({ subtree: true }).length)
- if (reduced !== 0) throw new Error("Reduced motion orb still animates")
- if (!verify) await page.screenshot({ path: path.join(out, "reduced.png") })
- await Bun.write(
- path.join(out, verify ? "verification.json" : "proof.json"),
- JSON.stringify({ initial, orbRequests, geometry, fade, reduced, explicitReduced, errors }, null, 2),
- )
- console.log(JSON.stringify({ initial, orbRequests, geometry, reduced, explicitReduced, errors }, null, 2))
- if (errors.length) throw new Error(errors.join("\n"))
-} finally {
- const video = page.video()
- await context.close()
- await video?.saveAs(path.join(out, "real-time.webm"))
- await browser.close()
- server.stop()
- await rm(root, { recursive: true, force: true })
-}
-if (!verify) {
- const video = Bun.spawn(
- [
- "ffmpeg",
- "-hide_banner",
- "-loglevel",
- "error",
- "-y",
- "-i",
- path.join(out, "real-time.webm"),
- "-an",
- "-c:v",
- "libx264",
- "-pix_fmt",
- "yuv420p",
- "-movflags",
- "+faststart",
- path.join(out, "real-time.mp4"),
- ],
- { stdout: "ignore", stderr: "inherit" },
- )
- if (await video.exited) throw new Error("Video encode failed")
-}
diff --git a/packages/stories/vite.config.ts b/packages/stories/vite.config.ts
index caa07bf5260..859970b3182 100644
--- a/packages/stories/vite.config.ts
+++ b/packages/stories/vite.config.ts
@@ -56,7 +56,6 @@ export default defineConfig({
{ find: /^@\/composer\/comments$/, replacement: path.resolve(mocks, "app/context/comments.ts") },
{ find: /^@\/shell\/commands\/command$/, replacement: path.resolve(mocks, "app/context/command.ts") },
{ find: /^@\/runtime\/platform\/platform$/, replacement: path.resolve(mocks, "app/context/platform.ts") },
- { find: /^@\/runtime\/server\/global-sync$/, replacement: path.resolve(mocks, "app/context/global-sync.ts") },
{ find: /^@\/runtime\/server\/sync$/, replacement: path.resolve(mocks, "app/context/server-sync.ts") },
{ find: /^@\/runtime\/server\/client$/, replacement: path.resolve(mocks, "app/context/server-sdk.ts") },
{ find: /^@\/runtime\/server\/current$/, replacement: path.resolve(mocks, "app/context/server-current.ts") },