summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/opencode/src/cli/cmd/tui/context/sync.tsx41
-rw-r--r--packages/opencode/src/cli/cmd/tui/context/theme.tsx6
-rw-r--r--packages/opencode/src/cli/cmd/tui/thread.ts3
-rw-r--r--packages/opencode/src/cli/cmd/tui/worker.ts5
-rw-r--r--packages/opencode/src/util/lazy.ts9
5 files changed, 44 insertions, 20 deletions
diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
index cc4e9c69a..893cc10ad 100644
--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
@@ -97,6 +97,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
sdk.event.listen((e) => {
const event = e.details
switch (event.type) {
+ case "server.instance.disposed":
+ bootstrap()
+ break
case "permission.replied": {
const requests = store.permission[event.properties.sessionID]
if (!requests) break
@@ -260,28 +263,26 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
const args = useArgs()
async function bootstrap() {
- const sessionListPromise = sdk.client.session.list().then((x) =>
- setStore(
- "session",
- (x.data ?? []).toSorted((a, b) => a.id.localeCompare(b.id)),
- ),
- )
+ console.log("bootstrapping")
+ const sessionListPromise = sdk.client.session
+ .list()
+ .then((x) => setStore("session", reconcile((x.data ?? []).toSorted((a, b) => a.id.localeCompare(b.id)))))
// blocking - include session.list when continuing a session
const blockingRequests: Promise<unknown>[] = [
sdk.client.config.providers({}, { throwOnError: true }).then((x) => {
batch(() => {
- setStore("provider", x.data!.providers)
- setStore("provider_default", x.data!.default)
+ setStore("provider", reconcile(x.data!.providers))
+ setStore("provider_default", reconcile(x.data!.default))
})
}),
sdk.client.provider.list({}, { throwOnError: true }).then((x) => {
batch(() => {
- setStore("provider_next", x.data!)
+ setStore("provider_next", reconcile(x.data!))
})
}),
- sdk.client.app.agents({}, { throwOnError: true }).then((x) => setStore("agent", x.data ?? [])),
- sdk.client.config.get({}, { throwOnError: true }).then((x) => setStore("config", x.data!)),
+ sdk.client.app.agents({}, { throwOnError: true }).then((x) => setStore("agent", reconcile(x.data ?? []))),
+ sdk.client.config.get({}, { throwOnError: true }).then((x) => setStore("config", reconcile(x.data!))),
...(args.continue ? [sessionListPromise] : []),
]
@@ -291,14 +292,16 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
// non-blocking
Promise.all([
...(args.continue ? [] : [sessionListPromise]),
- sdk.client.command.list().then((x) => setStore("command", x.data ?? [])),
- sdk.client.lsp.status().then((x) => setStore("lsp", x.data!)),
- sdk.client.mcp.status().then((x) => setStore("mcp", x.data!)),
- sdk.client.formatter.status().then((x) => setStore("formatter", x.data!)),
- sdk.client.session.status().then((x) => setStore("session_status", x.data!)),
- sdk.client.provider.auth().then((x) => setStore("provider_auth", x.data ?? {})),
- sdk.client.vcs.get().then((x) => setStore("vcs", x.data)),
- sdk.client.path.get().then((x) => setStore("path", x.data!)),
+ sdk.client.command.list().then((x) => setStore("command", reconcile(x.data ?? []))),
+ sdk.client.lsp.status().then((x) => setStore("lsp", reconcile(x.data!))),
+ sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))),
+ sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))),
+ sdk.client.session.status().then((x) => {
+ setStore("session_status", reconcile(x.data!))
+ }),
+ sdk.client.provider.auth().then((x) => setStore("provider_auth", reconcile(x.data ?? {}))),
+ sdk.client.vcs.get().then((x) => setStore("vcs", reconcile(x.data))),
+ sdk.client.path.get().then((x) => setStore("path", reconcile(x.data!))),
]).then(() => {
setStore("status", "complete")
})
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index a17b13533..8f8232378 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -284,6 +284,12 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
})
createEffect(() => {
+ const theme = sync.data.config.theme
+ console.log("theme", theme)
+ if (theme) setStore("active", theme)
+ })
+
+ createEffect(() => {
getCustomThemes()
.then((custom) => {
setStore(
diff --git a/packages/opencode/src/cli/cmd/tui/thread.ts b/packages/opencode/src/cli/cmd/tui/thread.ts
index 280f40fb9..7b6f028fc 100644
--- a/packages/opencode/src/cli/cmd/tui/thread.ts
+++ b/packages/opencode/src/cli/cmd/tui/thread.ts
@@ -77,6 +77,9 @@ export const TuiThreadCommand = cmd({
process.on("unhandledRejection", (e) => {
Log.Default.error(e)
})
+ process.on("SIGUSR2", async () => {
+ await client.call("reload", undefined)
+ })
const opts = await resolveNetworkOptions(args)
const server = await client.call("server", opts)
const prompt = await iife(async () => {
diff --git a/packages/opencode/src/cli/cmd/tui/worker.ts b/packages/opencode/src/cli/cmd/tui/worker.ts
index 3ffc45ae8..d32612dd5 100644
--- a/packages/opencode/src/cli/cmd/tui/worker.ts
+++ b/packages/opencode/src/cli/cmd/tui/worker.ts
@@ -6,6 +6,7 @@ import { InstanceBootstrap } from "@/project/bootstrap"
import { Rpc } from "@/util/rpc"
import { upgrade } from "@/cli/upgrade"
import type { BunWebSocketData } from "hono/bun"
+import { Config } from "@/config/config"
await Log.init({
print: process.argv.includes("--print-logs"),
@@ -51,6 +52,10 @@ export const rpc = {
},
})
},
+ async reload() {
+ Config.global.reset()
+ await Instance.disposeAll()
+ },
async shutdown() {
Log.Default.info("worker shutting down")
await Instance.disposeAll()
diff --git a/packages/opencode/src/util/lazy.ts b/packages/opencode/src/util/lazy.ts
index 935ebe0f9..0cc6d8d5c 100644
--- a/packages/opencode/src/util/lazy.ts
+++ b/packages/opencode/src/util/lazy.ts
@@ -2,10 +2,17 @@ export function lazy<T>(fn: () => T) {
let value: T | undefined
let loaded = false
- return (): T => {
+ const result = (): T => {
if (loaded) return value as T
loaded = true
value = fn()
return value as T
}
+
+ result.reset = () => {
+ loaded = false
+ value = undefined
+ }
+
+ return result
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-30 11:52:00 +0000